Commit ed77de9f authored by Harald Welte's avatar Harald Welte Committed by David S. Miller

[NETFILTER] nfnetlink: only load subsystems if CAP_NET_ADMIN is set

Without this patch, any user can cause nfnetlink subsystems to be
autoloaded.  Those subsystems however could add significant processing
overhead to packet processing, and would refuse any configuration messages
from non-CAP_NET_ADMIN processes anyway.

This patch follows a suggestion from Patrick McHardy.
Signed-off-by: default avatarHarald Welte <laforge@netfilter.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5978a9b8
...@@ -240,15 +240,18 @@ static inline int nfnetlink_rcv_msg(struct sk_buff *skb, ...@@ -240,15 +240,18 @@ static inline int nfnetlink_rcv_msg(struct sk_buff *skb,
ss = nfnetlink_get_subsys(type); ss = nfnetlink_get_subsys(type);
if (!ss) { if (!ss) {
#ifdef CONFIG_KMOD #ifdef CONFIG_KMOD
/* don't call nfnl_shunlock, since it would reenter if (cap_raised(NETLINK_CB(skb).eff_cap, CAP_NET_ADMIN)) {
* with further packet processing */ /* don't call nfnl_shunlock, since it would reenter
up(&nfnl_sem); * with further packet processing */
request_module("nfnetlink-subsys-%d", NFNL_SUBSYS_ID(type)); up(&nfnl_sem);
nfnl_shlock(); request_module("nfnetlink-subsys-%d",
ss = nfnetlink_get_subsys(type); NFNL_SUBSYS_ID(type));
nfnl_shlock();
ss = nfnetlink_get_subsys(type);
}
if (!ss) if (!ss)
#endif #endif
goto err_inval; goto err_inval;
} }
nc = nfnetlink_find_client(type, ss); nc = nfnetlink_find_client(type, ss);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment