projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security
[linux-2.6-block.git]
/
net
/
netfilter
/
nfnetlink.c
diff --git
a/net/netfilter/nfnetlink.c
b/net/netfilter/nfnetlink.c
index c879c1a2370e46829c442095b98a58ce705d78b3..4d70785b953daad4c1bc7459652427a3ef86e685 100644
(file)
--- a/
net/netfilter/nfnetlink.c
+++ b/
net/netfilter/nfnetlink.c
@@
-59,7
+59,7
@@
int nfnetlink_subsys_register(const struct nfnetlink_subsystem *n)
nfnl_unlock();
return -EBUSY;
}
nfnl_unlock();
return -EBUSY;
}
-
RCU_INIT_POINTER
(subsys_table[n->subsys_id], n);
+
rcu_assign_pointer
(subsys_table[n->subsys_id], n);
nfnl_unlock();
return 0;
nfnl_unlock();
return 0;
@@
-130,7
+130,7
@@
static int nfnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
const struct nfnetlink_subsystem *ss;
int type, err;
const struct nfnetlink_subsystem *ss;
int type, err;
- if (
security_netlink_recv(skb,
CAP_NET_ADMIN))
+ if (
!capable(
CAP_NET_ADMIN))
return -EPERM;
/* All the messages must at least contain nfgenmsg */
return -EPERM;
/* All the messages must at least contain nfgenmsg */
@@
-210,7
+210,7
@@
static int __net_init nfnetlink_net_init(struct net *net)
if (!nfnl)
return -ENOMEM;
net->nfnl_stash = nfnl;
if (!nfnl)
return -ENOMEM;
net->nfnl_stash = nfnl;
-
RCU_INIT_POINTER
(net->nfnl, nfnl);
+
rcu_assign_pointer
(net->nfnl, nfnl);
return 0;
}
return 0;
}