git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
net
/
decnet
/
netfilter
/
dn_rtmsg.c
diff --git
a/net/decnet/netfilter/dn_rtmsg.c
b/net/decnet/netfilter/dn_rtmsg.c
index
16a5a31
..
8b99bd3
100644
(file)
--- a/
net/decnet/netfilter/dn_rtmsg.c
+++ b/
net/decnet/netfilter/dn_rtmsg.c
@@
-107,7
+107,7
@@
static inline void dnrmg_receive_user_skb(struct sk_buff *skb)
if (nlh->nlmsg_len < sizeof(*nlh) || skb->len < nlh->nlmsg_len)
return;
if (nlh->nlmsg_len < sizeof(*nlh) || skb->len < nlh->nlmsg_len)
return;
- if (
!cap_raised(NETLINK_CB(skb).eff_cap
, CAP_NET_ADMIN))
+ if (
security_netlink_recv(skb
, CAP_NET_ADMIN))
RCV_SKB_FAIL(-EPERM);
/* Eventually we might send routing messages too */
RCV_SKB_FAIL(-EPERM);
/* Eventually we might send routing messages too */
@@
-133,7
+133,7
@@
static struct nf_hook_ops dnrmg_ops = {
.priority = NF_DN_PRI_DNRTMSG,
};
.priority = NF_DN_PRI_DNRTMSG,
};
-static int __init init(void)
+static int __init
dn_rtmsg_
init(void)
{
int rv = 0;
{
int rv = 0;
@@
-152,7
+152,7
@@
static int __init init(void)
return rv;
}
return rv;
}
-static void __exit fini(void)
+static void __exit
dn_rtmsg_
fini(void)
{
nf_unregister_hook(&dnrmg_ops);
sock_release(dnrmg->sk_socket);
{
nf_unregister_hook(&dnrmg_ops);
sock_release(dnrmg->sk_socket);
@@
-164,6
+164,6
@@
MODULE_AUTHOR("Steven Whitehouse <steve@chygwyn.com>");
MODULE_LICENSE("GPL");
MODULE_ALIAS_NET_PF_PROTO(PF_NETLINK, NETLINK_DNRTMSG);
MODULE_LICENSE("GPL");
MODULE_ALIAS_NET_PF_PROTO(PF_NETLINK, NETLINK_DNRTMSG);
-module_init(init);
-module_exit(fini);
+module_init(
dn_rtmsg_
init);
+module_exit(
dn_rtmsg_
fini);