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

Commit d3904b73 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

[NET]: Cleanup the error path in sk_attach_filter 



The sk_filter_uncharge is called for error handling and
for releasing the former filter, but this will have to
be done in a bit different manner, so cleanup the error
path a bit.

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 309dd5fc

net/core/filter.c

+11 −12
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ int sk_chk_filter(struct sock_filter *filter, int flen) 
 */

int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk)

{

	struct sk_filter *fp;

	struct sk_filter *fp, *old_fp;

	unsigned int fsize = sizeof(struct sock_filter) * fprog->len;

	int err;
@@ -418,19 +418,18 @@ int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk) 
	fp->len = fprog->len;



	err = sk_chk_filter(fp->insns, fp->len);

	if (!err) {

		struct sk_filter *old_fp;

	if (err) {

		sk_filter_uncharge(sk, fp);

		return err;

	}



	rcu_read_lock_bh();

	old_fp = rcu_dereference(sk->sk_filter);

	rcu_assign_pointer(sk->sk_filter, fp);

	rcu_read_unlock_bh();

		fp = old_fp;

	}



	if (fp)

		sk_filter_uncharge(sk, fp);

	return err;

	sk_filter_uncharge(sk, old_fp);

	return 0;

}



int sk_detach_filter(struct sock *sk)