Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e18e37e5 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6

parents a0a69a01 a0142733

net/netfilter/nf_conntrack_netlink.c

+6 −4
Original line number Diff line number Diff line
@@ -512,7 +512,7 @@ static int ctnetlink_conntrack_event(struct notifier_block *this, 


	skb = ctnetlink_alloc_skb(tuple(ct, IP_CT_DIR_ORIGINAL), GFP_ATOMIC);

	if (!skb)

		return NOTIFY_DONE;

		goto errout;



	b = skb->tail;
@@ -591,8 +591,9 @@ static int ctnetlink_conntrack_event(struct notifier_block *this, 
nla_put_failure:

	rcu_read_unlock();

nlmsg_failure:

	nfnetlink_set_err(0, group, -ENOBUFS);

	kfree_skb(skb);

errout:

	nfnetlink_set_err(0, group, -ENOBUFS);

	return NOTIFY_DONE;

}

#endif /* CONFIG_NF_CONNTRACK_EVENTS */
@@ -1564,7 +1565,7 @@ static int ctnetlink_expect_event(struct notifier_block *this, 


	skb = alloc_skb(NLMSG_GOODSIZE, GFP_ATOMIC);

	if (!skb)

		return NOTIFY_DONE;

		goto errout;



	b = skb->tail;
@@ -1589,8 +1590,9 @@ static int ctnetlink_expect_event(struct notifier_block *this, 
nla_put_failure:

	rcu_read_unlock();

nlmsg_failure:

	nfnetlink_set_err(0, 0, -ENOBUFS);

	kfree_skb(skb);

errout:

	nfnetlink_set_err(0, 0, -ENOBUFS);

	return NOTIFY_DONE;

}

#endif

net/netfilter/nfnetlink.c

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ static int __init nfnetlink_init(void) 
				     nfnetlink_rcv, NULL, THIS_MODULE);

	if (!nfnl) {

		printk(KERN_ERR "cannot initialize nfnetlink!\n");

		return -1;

		return -ENOMEM;

	}



	return 0;