diff options
| author | Will Deacon <will.deacon@arm.com> | 2014-05-28 19:29:23 +0200 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2014-05-28 19:29:23 +0200 |
| commit | 2eb8b396dc6ecf797925cc6bad4c0c6dfbdf4d44 (patch) | |
| tree | de062b67715e1eb0321032ad2a87f12cb664643b /net/phonet/pn_netlink.c | |
| parent | arm64: Fix linker script entry point (diff) | |
| parent | ftrace: Make CALLER_ADDRx macros more generic (diff) | |
| download | linux-2eb8b396dc6ecf797925cc6bad4c0c6dfbdf4d44.tar.xz linux-2eb8b396dc6ecf797925cc6bad4c0c6dfbdf4d44.zip | |
Merge branch 'ftrace/arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into for-next/core
Core ftrace changes from Steve Rostedt, required by the arm64 support
code.
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) int err; u8 pnaddr; - if (!capable(CAP_NET_ADMIN)) + if (!netlink_capable(skb, CAP_NET_ADMIN)) return -EPERM; - if (!capable(CAP_SYS_ADMIN)) + if (!netlink_capable(skb, CAP_SYS_ADMIN)) return -EPERM; ASSERT_RTNL(); @@ -233,10 +233,10 @@ static int route_doit(struct sk_buff *skb, struct nlmsghdr *nlh) int err; u8 dst; - if (!capable(CAP_NET_ADMIN)) + if (!netlink_capable(skb, CAP_NET_ADMIN)) return -EPERM; - if (!capable(CAP_SYS_ADMIN)) + if (!netlink_capable(skb, CAP_SYS_ADMIN)) return -EPERM; ASSERT_RTNL(); |