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

Commit 3ec9b221 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "packet: hold bind lock when rebinding to fanout hook"

parents 3c1fc89b 9378c07e

net/packet/af_packet.c

+11 −5
Original line number Diff line number Diff line
@@ -1652,10 +1652,6 @@ static int fanout_add(struct sock *sk, u16 id, u16 type_flags) 


	mutex_lock(&fanout_mutex);



	err = -EINVAL;

	if (!po->running)

		goto out;



	err = -EALREADY;

	if (po->fanout)

		goto out;
@@ -1704,7 +1700,10 @@ static int fanout_add(struct sock *sk, u16 id, u16 type_flags) 
		list_add(&match->list, &fanout_list);

	}

	err = -EINVAL;

	if (match->type == type &&



	spin_lock(&po->bind_lock);

	if (po->running &&

	    match->type == type &&

	    match->prot_hook.type == po->prot_hook.type &&

	    match->prot_hook.dev == po->prot_hook.dev) {

		err = -ENOSPC;
@@ -1716,6 +1715,13 @@ static int fanout_add(struct sock *sk, u16 id, u16 type_flags) 
			err = 0;

		}

	}

	spin_unlock(&po->bind_lock);



	if (err && !refcount_read(&match->sk_ref)) {

		list_del(&match->list);

		kfree(match);

	}



out:

	if (err && rollover) {

		kfree(rollover);