| Date | Tue, 30 Mar 2010 15:42:53 -0700 | From | Greg KH <> | Subject | [139/156] netfilter: ctnetlink: fix reliable event delivery if message building fails |
| |
2.6.33-stable review patch. If anyone has any objections, please let us know.
------------------
From: Pablo Neira Ayuso <pablo@netfilter.org>
[ Upstream commit 37b7ef7203240b3aba577bb1ff6765fe15225976 ]
This patch fixes a bug that allows to lose events when reliable event delivery mode is used, ie. if NETLINK_BROADCAST_SEND_ERROR and NETLINK_RECV_NO_ENOBUFS socket options are set.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- include/linux/netfilter/nfnetlink.h | 2 +- net/netfilter/nf_conntrack_netlink.c | 3 ++- net/netfilter/nfnetlink.c | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-)
--- a/include/linux/netfilter/nfnetlink.h +++ b/include/linux/netfilter/nfnetlink.h @@ -76,7 +76,7 @@ extern int nfnetlink_subsys_unregister(c extern int nfnetlink_has_listeners(unsigned int group); extern int nfnetlink_send(struct sk_buff *skb, u32 pid, unsigned group, int echo, gfp_t flags); -extern void nfnetlink_set_err(u32 pid, u32 group, int error); +extern int nfnetlink_set_err(u32 pid, u32 group, int error); extern int nfnetlink_unicast(struct sk_buff *skb, u_int32_t pid, int flags); extern void nfnl_lock(void); --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c @@ -571,7 +571,8 @@ nla_put_failure: nlmsg_failure: kfree_skb(skb); errout: - nfnetlink_set_err(0, group, -ENOBUFS); + if (nfnetlink_set_err(0, group, -ENOBUFS) > 0) + return -ENOBUFS; return 0; } #endif /* CONFIG_NF_CONNTRACK_EVENTS */ --- a/net/netfilter/nfnetlink.c +++ b/net/netfilter/nfnetlink.c @@ -114,9 +114,9 @@ int nfnetlink_send(struct sk_buff *skb, } EXPORT_SYMBOL_GPL(nfnetlink_send); -void nfnetlink_set_err(u32 pid, u32 group, int error) +int nfnetlink_set_err(u32 pid, u32 group, int error) { - netlink_set_err(nfnl, pid, group, error); + return netlink_set_err(nfnl, pid, group, error); } EXPORT_SYMBOL_GPL(nfnetlink_set_err);
|