Merge branch 'nf' of git://1984.lsi.us.es/net
This commit is contained in:
commit
c43c5f3958
|
@ -1358,12 +1358,15 @@ ctnetlink_create_conntrack(struct net *net, u16 zone,
|
||||||
nf_ct_protonum(ct));
|
nf_ct_protonum(ct));
|
||||||
if (helper == NULL) {
|
if (helper == NULL) {
|
||||||
rcu_read_unlock();
|
rcu_read_unlock();
|
||||||
|
spin_unlock_bh(&nf_conntrack_lock);
|
||||||
#ifdef CONFIG_MODULES
|
#ifdef CONFIG_MODULES
|
||||||
if (request_module("nfct-helper-%s", helpname) < 0) {
|
if (request_module("nfct-helper-%s", helpname) < 0) {
|
||||||
|
spin_lock_bh(&nf_conntrack_lock);
|
||||||
err = -EOPNOTSUPP;
|
err = -EOPNOTSUPP;
|
||||||
goto err1;
|
goto err1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
spin_lock_bh(&nf_conntrack_lock);
|
||||||
rcu_read_lock();
|
rcu_read_lock();
|
||||||
helper = __nf_conntrack_helper_find(helpname,
|
helper = __nf_conntrack_helper_find(helpname,
|
||||||
nf_ct_l3num(ct),
|
nf_ct_l3num(ct),
|
||||||
|
@ -1869,25 +1872,30 @@ ctnetlink_get_expect(struct sock *ctnl, struct sk_buff *skb,
|
||||||
|
|
||||||
err = -ENOMEM;
|
err = -ENOMEM;
|
||||||
skb2 = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
|
skb2 = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
|
||||||
if (skb2 == NULL)
|
if (skb2 == NULL) {
|
||||||
|
nf_ct_expect_put(exp);
|
||||||
goto out;
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
rcu_read_lock();
|
rcu_read_lock();
|
||||||
err = ctnetlink_exp_fill_info(skb2, NETLINK_CB(skb).pid,
|
err = ctnetlink_exp_fill_info(skb2, NETLINK_CB(skb).pid,
|
||||||
nlh->nlmsg_seq, IPCTNL_MSG_EXP_NEW, exp);
|
nlh->nlmsg_seq, IPCTNL_MSG_EXP_NEW, exp);
|
||||||
rcu_read_unlock();
|
rcu_read_unlock();
|
||||||
|
nf_ct_expect_put(exp);
|
||||||
if (err <= 0)
|
if (err <= 0)
|
||||||
goto free;
|
goto free;
|
||||||
|
|
||||||
nf_ct_expect_put(exp);
|
err = netlink_unicast(ctnl, skb2, NETLINK_CB(skb).pid, MSG_DONTWAIT);
|
||||||
|
if (err < 0)
|
||||||
|
goto out;
|
||||||
|
|
||||||
return netlink_unicast(ctnl, skb2, NETLINK_CB(skb).pid, MSG_DONTWAIT);
|
return 0;
|
||||||
|
|
||||||
free:
|
free:
|
||||||
kfree_skb(skb2);
|
kfree_skb(skb2);
|
||||||
out:
|
out:
|
||||||
nf_ct_expect_put(exp);
|
/* this avoids a loop in nfnetlink. */
|
||||||
return err;
|
return err == -EAGAIN ? -ENOBUFS : err;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
|
|
Loading…
Reference in a new issue