Commit 6cc7a765 authored by Maciej Żenczykowski's avatar Maciej Żenczykowski Committed by David S. Miller
Browse files

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



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: default avatarMaciej Żenczykowski <maze@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 05bdd2f1

include/linux/capability.h

+2 −1
Original line number Diff line number Diff line
@@ -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

net/ipv4/ip_sockglue.c

+1 −1
Original line number Diff line number Diff line
@@ -961,7 +961,7 @@ mc_msf_out: 
		break;



	case IP_TRANSPARENT:

		if (!capable(CAP_NET_ADMIN)) {

		if (!!val && !capable(CAP_NET_RAW) && !capable(CAP_NET_ADMIN)) {

			err = -EPERM;

			break;

		}

net/ipv6/ipv6_sockglue.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE