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

Commit 50b2abed authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  packet: fix possible dev refcnt leak when bind fail
  netem: dont call vfree() under spinlock and BH disabled
  netfilter: ctnetlink: fix scheduling while atomic if helper is autoloaded
  netfilter: ctnetlink: fix return value of ctnetlink_get_expect()
parents 7578ed02 aef950b4

net/netfilter/nf_conntrack_netlink.c

+13 −5
Original line number Diff line number Diff line
@@ -1358,12 +1358,15 @@ ctnetlink_create_conntrack(struct net *net, u16 zone, 
						    nf_ct_protonum(ct));

		if (helper == NULL) {

			rcu_read_unlock();

			spin_unlock_bh(&nf_conntrack_lock);

#ifdef CONFIG_MODULES

			if (request_module("nfct-helper-%s", helpname) < 0) {

				spin_lock_bh(&nf_conntrack_lock);

				err = -EOPNOTSUPP;

				goto err1;

			}



			spin_lock_bh(&nf_conntrack_lock);

			rcu_read_lock();

			helper = __nf_conntrack_helper_find(helpname,

							    nf_ct_l3num(ct),
@@ -1869,25 +1872,30 @@ ctnetlink_get_expect(struct sock *ctnl, struct sk_buff *skb, 


	err = -ENOMEM;

	skb2 = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);

	if (skb2 == NULL)

	if (skb2 == NULL) {

		nf_ct_expect_put(exp);

		goto out;

	}



	rcu_read_lock();

	err = ctnetlink_exp_fill_info(skb2, NETLINK_CB(skb).pid,

				      nlh->nlmsg_seq, IPCTNL_MSG_EXP_NEW, exp);

	rcu_read_unlock();

	nf_ct_expect_put(exp);

	if (err <= 0)

		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:

	kfree_skb(skb2);

out:

	nf_ct_expect_put(exp);

	return err;

	/* this avoids a loop in nfnetlink. */

	return err == -EAGAIN ? -ENOBUFS : err;

}



static int

net/packet/af_packet.c

+5 −1
Original line number Diff line number Diff line
@@ -2448,8 +2448,12 @@ static int packet_do_bind(struct sock *sk, struct net_device *dev, __be16 protoc 
{

	struct packet_sock *po = pkt_sk(sk);



	if (po->fanout)

	if (po->fanout) {

		if (dev)

			dev_put(dev);



		return -EINVAL;

	}



	lock_sock(sk);

net/sched/sch_netem.c

+4 −3
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ static int get_dist_table(struct Qdisc *sch, const struct nlattr *attr) 
		return -EINVAL;



	s = sizeof(struct disttable) + n * sizeof(s16);

	d = kmalloc(s, GFP_KERNEL);

	d = kmalloc(s, GFP_KERNEL | __GFP_NOWARN);

	if (!d)

		d = vmalloc(s);

	if (!d)
@@ -501,9 +501,10 @@ static int get_dist_table(struct Qdisc *sch, const struct nlattr *attr) 
	root_lock = qdisc_root_sleeping_lock(sch);



	spin_lock_bh(root_lock);

	dist_free(q->delay_dist);

	q->delay_dist = d;

	swap(q->delay_dist, d);

	spin_unlock_bh(root_lock);



	dist_free(d);

	return 0;

}