Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf5b30b8 authored by Zhao Hongjiang's avatar Zhao Hongjiang Committed by David S. Miller
Browse files

net: change return values from -EACCES to -EPERM 



Change return value from -EACCES to -EPERM when the permission check fails.

Signed-off-by: default avatarZhao Hongjiang <zhaohongjiang@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e0c7a4a1

net/bluetooth/bnep/sock.c

+2 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static int bnep_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long 
	switch (cmd) {

	case BNEPCONNADD:

		if (!capable(CAP_NET_ADMIN))

			return -EACCES;

			return -EPERM;



		if (copy_from_user(&ca, argp, sizeof(ca)))

			return -EFAULT;
@@ -84,7 +84,7 @@ static int bnep_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long 


	case BNEPCONNDEL:

		if (!capable(CAP_NET_ADMIN))

			return -EACCES;

			return -EPERM;



		if (copy_from_user(&cd, argp, sizeof(cd)))

			return -EFAULT;

net/bluetooth/cmtp/sock.c

+2 −2
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static int cmtp_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long 
	switch (cmd) {

	case CMTPCONNADD:

		if (!capable(CAP_NET_ADMIN))

			return -EACCES;

			return -EPERM;



		if (copy_from_user(&ca, argp, sizeof(ca)))

			return -EFAULT;
@@ -97,7 +97,7 @@ static int cmtp_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long 


	case CMTPCONNDEL:

		if (!capable(CAP_NET_ADMIN))

			return -EACCES;

			return -EPERM;



		if (copy_from_user(&cd, argp, sizeof(cd)))

			return -EFAULT;

net/bluetooth/hci_sock.c

+8 −8
Original line number Diff line number Diff line
@@ -490,7 +490,7 @@ static int hci_sock_bound_ioctl(struct sock *sk, unsigned int cmd, 
	switch (cmd) {

	case HCISETRAW:

		if (!capable(CAP_NET_ADMIN))

			return -EACCES;

			return -EPERM;



		if (test_bit(HCI_QUIRK_RAW_DEVICE, &hdev->quirks))

			return -EPERM;
@@ -510,12 +510,12 @@ static int hci_sock_bound_ioctl(struct sock *sk, unsigned int cmd, 


	case HCIBLOCKADDR:

		if (!capable(CAP_NET_ADMIN))

			return -EACCES;

			return -EPERM;

		return hci_sock_blacklist_add(hdev, (void __user *) arg);



	case HCIUNBLOCKADDR:

		if (!capable(CAP_NET_ADMIN))

			return -EACCES;

			return -EPERM;

		return hci_sock_blacklist_del(hdev, (void __user *) arg);



	default:
@@ -546,22 +546,22 @@ static int hci_sock_ioctl(struct socket *sock, unsigned int cmd, 


	case HCIDEVUP:

		if (!capable(CAP_NET_ADMIN))

			return -EACCES;

			return -EPERM;

		return hci_dev_open(arg);



	case HCIDEVDOWN:

		if (!capable(CAP_NET_ADMIN))

			return -EACCES;

			return -EPERM;

		return hci_dev_close(arg);



	case HCIDEVRESET:

		if (!capable(CAP_NET_ADMIN))

			return -EACCES;

			return -EPERM;

		return hci_dev_reset(arg);



	case HCIDEVRESTAT:

		if (!capable(CAP_NET_ADMIN))

			return -EACCES;

			return -EPERM;

		return hci_dev_reset_stat(arg);



	case HCISETSCAN:
@@ -573,7 +573,7 @@ static int hci_sock_ioctl(struct socket *sock, unsigned int cmd, 
	case HCISETACLMTU:

	case HCISETSCOMTU:

		if (!capable(CAP_NET_ADMIN))

			return -EACCES;

			return -EPERM;

		return hci_dev_cmd(cmd, argp);



	case HCIINQUIRY:

net/bluetooth/hidp/sock.c

+2 −2
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static int hidp_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long 
	switch (cmd) {

	case HIDPCONNADD:

		if (!capable(CAP_NET_ADMIN))

			return -EACCES;

			return -EPERM;



		if (copy_from_user(&ca, argp, sizeof(ca)))

			return -EFAULT;
@@ -91,7 +91,7 @@ static int hidp_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long 


	case HIDPCONNDEL:

		if (!capable(CAP_NET_ADMIN))

			return -EACCES;

			return -EPERM;



		if (copy_from_user(&cd, argp, sizeof(cd)))

			return -EFAULT;

net/ipv4/devinet.c

+2 −2
Original line number Diff line number Diff line
@@ -725,7 +725,7 @@ int devinet_ioctl(struct net *net, unsigned int cmd, void __user *arg) 
		break;



	case SIOCSIFFLAGS:

		ret = -EACCES;

		ret = -EPERM;

		if (!capable(CAP_NET_ADMIN))

			goto out;

		break;
@@ -733,7 +733,7 @@ int devinet_ioctl(struct net *net, unsigned int cmd, void __user *arg) 
	case SIOCSIFBRDADDR:	/* Set the broadcast address */

	case SIOCSIFDSTADDR:	/* Set the destination address */

	case SIOCSIFNETMASK: 	/* Set the netmask for the interface */

		ret = -EACCES;

		ret = -EPERM;

		if (!capable(CAP_NET_ADMIN))

			goto out;

		ret = -EINVAL;