diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-05-22 04:28:56 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-05-22 04:28:56 -0400 |
| commit | 65c2ce70046c779974af8b5dfc25a0df489089b5 (patch) | |
| tree | b16f152eb62b71cf5a1edc51da865b357c989922 /net/phonet/pn_netlink.c | |
| parent | 842514849a616e9b61acad65771c7afe01e651f9 (diff) | |
| parent | 4b660a7f5c8099d88d1a43d8ae138965112592c7 (diff) | |
Merge tag 'v3.15-rc6' into sched/core, to pick up the latest fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/phonet/pn_netlink.c')
| -rw-r--r-- | net/phonet/pn_netlink.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/phonet/pn_netlink.c b/net/phonet/pn_netlink.c index dc15f4300808..b64151ade6b3 100644 --- a/net/phonet/pn_netlink.c +++ b/net/phonet/pn_netlink.c | |||
| @@ -70,10 +70,10 @@ static int addr_doit(struct sk_buff *skb, struct nlmsghdr *nlh) | |||
| 70 | int err; | 70 | int err; |
| 71 | u8 pnaddr; | 71 | u8 pnaddr; |
| 72 | 72 | ||
| 73 | if (!capable(CAP_NET_ADMIN)) | 73 | if (!netlink_capable(skb, CAP_NET_ADMIN)) |
| 74 | return -EPERM; | 74 | return -EPERM; |
| 75 | 75 | ||
| 76 | if (!capable(CAP_SYS_ADMIN)) | 76 | if (!netlink_capable(skb, CAP_SYS_ADMIN)) |
| 77 | return -EPERM; | 77 | return -EPERM; |
| 78 | 78 | ||
| 79 | ASSERT_RTNL(); | 79 | ASSERT_RTNL(); |
| @@ -233,10 +233,10 @@ static int route_doit(struct sk_buff *skb, struct nlmsghdr *nlh) | |||
| 233 | int err; | 233 | int err; |
| 234 | u8 dst; | 234 | u8 dst; |
| 235 | 235 | ||
| 236 | if (!capable(CAP_NET_ADMIN)) | 236 | if (!netlink_capable(skb, CAP_NET_ADMIN)) |
| 237 | return -EPERM; | 237 | return -EPERM; |
| 238 | 238 | ||
| 239 | if (!capable(CAP_SYS_ADMIN)) | 239 | if (!netlink_capable(skb, CAP_SYS_ADMIN)) |
| 240 | return -EPERM; | 240 | return -EPERM; |
| 241 | 241 | ||
| 242 | ASSERT_RTNL(); | 242 | ASSERT_RTNL(); |