tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

net: change return values from -EACCES to -EPERM

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

Signed-off-by: Zhao Hongjiang <zhaohongjiang@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Zhao Hongjiang and committed by
David S. Miller bf5b30b8 e0c7a4a1

+17 -17
+2 -2
net/bluetooth/bnep/sock.c
··· 58 58 switch (cmd) { 59 59 case BNEPCONNADD: 60 60 if (!capable(CAP_NET_ADMIN)) 61 - return -EACCES; 61 + return -EPERM; 62 62 63 63 if (copy_from_user(&ca, argp, sizeof(ca))) 64 64 return -EFAULT; ··· 84 84 85 85 case BNEPCONNDEL: 86 86 if (!capable(CAP_NET_ADMIN)) 87 - return -EACCES; 87 + return -EPERM; 88 88 89 89 if (copy_from_user(&cd, argp, sizeof(cd))) 90 90 return -EFAULT;
+2 -2
net/bluetooth/cmtp/sock.c
··· 72 72 switch (cmd) { 73 73 case CMTPCONNADD: 74 74 if (!capable(CAP_NET_ADMIN)) 75 - return -EACCES; 75 + return -EPERM; 76 76 77 77 if (copy_from_user(&ca, argp, sizeof(ca))) 78 78 return -EFAULT; ··· 97 97 98 98 case CMTPCONNDEL: 99 99 if (!capable(CAP_NET_ADMIN)) 100 - return -EACCES; 100 + return -EPERM; 101 101 102 102 if (copy_from_user(&cd, argp, sizeof(cd))) 103 103 return -EFAULT;
+8 -8
net/bluetooth/hci_sock.c
··· 490 490 switch (cmd) { 491 491 case HCISETRAW: 492 492 if (!capable(CAP_NET_ADMIN)) 493 - return -EACCES; 493 + return -EPERM; 494 494 495 495 if (test_bit(HCI_QUIRK_RAW_DEVICE, &hdev->quirks)) 496 496 return -EPERM; ··· 510 510 511 511 case HCIBLOCKADDR: 512 512 if (!capable(CAP_NET_ADMIN)) 513 - return -EACCES; 513 + return -EPERM; 514 514 return hci_sock_blacklist_add(hdev, (void __user *) arg); 515 515 516 516 case HCIUNBLOCKADDR: 517 517 if (!capable(CAP_NET_ADMIN)) 518 - return -EACCES; 518 + return -EPERM; 519 519 return hci_sock_blacklist_del(hdev, (void __user *) arg); 520 520 521 521 default: ··· 546 546 547 547 case HCIDEVUP: 548 548 if (!capable(CAP_NET_ADMIN)) 549 - return -EACCES; 549 + return -EPERM; 550 550 return hci_dev_open(arg); 551 551 552 552 case HCIDEVDOWN: 553 553 if (!capable(CAP_NET_ADMIN)) 554 - return -EACCES; 554 + return -EPERM; 555 555 return hci_dev_close(arg); 556 556 557 557 case HCIDEVRESET: 558 558 if (!capable(CAP_NET_ADMIN)) 559 - return -EACCES; 559 + return -EPERM; 560 560 return hci_dev_reset(arg); 561 561 562 562 case HCIDEVRESTAT: 563 563 if (!capable(CAP_NET_ADMIN)) 564 - return -EACCES; 564 + return -EPERM; 565 565 return hci_dev_reset_stat(arg); 566 566 567 567 case HCISETSCAN: ··· 573 573 case HCISETACLMTU: 574 574 case HCISETSCOMTU: 575 575 if (!capable(CAP_NET_ADMIN)) 576 - return -EACCES; 576 + return -EPERM; 577 577 return hci_dev_cmd(cmd, argp); 578 578 579 579 case HCIINQUIRY:
+2 -2
net/bluetooth/hidp/sock.c
··· 56 56 switch (cmd) { 57 57 case HIDPCONNADD: 58 58 if (!capable(CAP_NET_ADMIN)) 59 - return -EACCES; 59 + return -EPERM; 60 60 61 61 if (copy_from_user(&ca, argp, sizeof(ca))) 62 62 return -EFAULT; ··· 91 91 92 92 case HIDPCONNDEL: 93 93 if (!capable(CAP_NET_ADMIN)) 94 - return -EACCES; 94 + return -EPERM; 95 95 96 96 if (copy_from_user(&cd, argp, sizeof(cd))) 97 97 return -EFAULT;
+2 -2
net/ipv4/devinet.c
··· 725 725 break; 726 726 727 727 case SIOCSIFFLAGS: 728 - ret = -EACCES; 728 + ret = -EPERM; 729 729 if (!capable(CAP_NET_ADMIN)) 730 730 goto out; 731 731 break; ··· 733 733 case SIOCSIFBRDADDR: /* Set the broadcast address */ 734 734 case SIOCSIFDSTADDR: /* Set the destination address */ 735 735 case SIOCSIFNETMASK: /* Set the netmask for the interface */ 736 - ret = -EACCES; 736 + ret = -EPERM; 737 737 if (!capable(CAP_NET_ADMIN)) 738 738 goto out; 739 739 ret = -EINVAL;
+1 -1
net/netrom/af_netrom.c
··· 601 601 if (!capable(CAP_NET_BIND_SERVICE)) { 602 602 dev_put(dev); 603 603 release_sock(sk); 604 - return -EACCES; 604 + return -EPERM; 605 605 } 606 606 nr->user_addr = addr->fsa_digipeater[0]; 607 607 nr->source_addr = addr->fsa_ax25.sax25_call;