Merge branch 'linus' into release

[~andy/linux] / security / commoncap.c

diff --git a/security/commoncap.c b/security/commoncap.c
index dbfdaed4cc663c6ed40836f69da8f35a9f27245a..49c57fd60aea226d53070c1f9fd71ee208df9da5 100644 (file)
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -52,13 +52,12 @@ static void warn_setuid_and_fcaps_mixed(const char *fname)
 
 int cap_netlink_send(struct sock *sk, struct sk_buff *skb)
 {
-       NETLINK_CB(skb).eff_cap = current_cap();
        return 0;
 }
 
 int cap_netlink_recv(struct sk_buff *skb, int cap)
 {
-       if (!cap_raised(NETLINK_CB(skb).eff_cap, cap))
+       if (!cap_raised(current_cap(), cap))
                return -EPERM;
        return 0;
 }