net: allow CAP_NET_RAW to set socket options IP{,V6}_TRANSPARENT

zenczykowski · davem330 · commit 6cc7a765c298 · 2011-10-20T18:21:36.000-04:00
Up till now the IP{,V6}_TRANSPARENT socket options (which actually set
the same bit in the socket struct) have required CAP_NET_ADMIN
privileges to set or clear the option.

- we make clearing the bit not require any privileges.
- we allow CAP_NET_ADMIN to set the bit (as before this change)
- we allow CAP_NET_RAW to set this bit, because raw
  sockets already pretty much effectively allow you
  to emulate socket transparency.

Signed-off-by: Maciej Żenczykowski &lt;maze@google.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/include/linux/capability.h b/include/linux/capability.h
@@ -198,7 +198,7 @@ struct cpu_vfs_cap_data {
 /* Allow modification of routing tables */
 /* Allow setting arbitrary process / process group ownership on
    sockets */
-/* Allow binding to any address for transparent proxying */
+/* Allow binding to any address for transparent proxying (also via NET_RAW) */
 /* Allow setting TOS (type of service) */
 /* Allow setting promiscuous mode */
 /* Allow clearing driver statistics */
@@ -210,6 +210,7 @@ struct cpu_vfs_cap_data {
 
 /* Allow use of RAW sockets */
 /* Allow use of PACKET sockets */
+/* Allow binding to any address for transparent proxying (also via NET_ADMIN) */
 
 #define CAP_NET_RAW          13
 
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
@@ -961,7 +961,7 @@ static int do_ip_setsockopt(struct sock *sk, int level,
 		break;
 
 	case IP_TRANSPARENT:
-		if (!capable(CAP_NET_ADMIN)) {
+		if (!!val && !capable(CAP_NET_RAW) && !capable(CAP_NET_ADMIN)) {
 			err = -EPERM;
 			break;
 		}
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
@@ -343,7 +343,7 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,
 		break;
 
 	case IPV6_TRANSPARENT:
-		if (!capable(CAP_NET_ADMIN)) {
+		if (valbool && !capable(CAP_NET_ADMIN) && !capable(CAP_NET_RAW)) {
 			retv = -EPERM;
 			break;
 		}

Original file line number	Diff line number	Diff line change
`@@ -961,7 +961,7 @@ static int do_ip_setsockopt(struct sock *sk, int level,`
`961`	`961`	`break;`
`962`	`962`
`963`	`963`	`case IP_TRANSPARENT:`
`964`		`- if (!capable(CAP_NET_ADMIN)) {`
	`964`	`+ if (!!val && !capable(CAP_NET_RAW) && !capable(CAP_NET_ADMIN)) {`
`965`	`965`	`err = -EPERM;`
`966`	`966`	`break;`
`967`	`967`	`}`
Original file line number	Diff line number	Diff line change
`@@ -343,7 +343,7 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,`
`343`	`343`	`break;`
`344`	`344`
`345`	`345`	`case IPV6_TRANSPARENT:`
`346`		`- if (!capable(CAP_NET_ADMIN)) {`
	`346`	`+ if (valbool && !capable(CAP_NET_ADMIN) && !capable(CAP_NET_RAW)) {`
`347`	`347`	`retv = -EPERM;`
`348`	`348`	`break;`
`349`	`349`	`}`