Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[NET]: Cleanup the error path in sk_attach_filter

Browse source 
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: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Pavel Emelyanov 2007-10-17 21:22:17 -07:00 committed by David S. Miller
parent 309dd5fc87
commit d3904b7399
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
net/core/filter.c
View file

@ -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) 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; unsigned int fsize = sizeof(struct sock_filter) * fprog->len;
int err; int err;
@ -418,19 +418,18 @@ int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk)
fp->len = fprog->len; fp->len = fprog->len;
err = sk_chk_filter(fp->insns, fp->len); err = sk_chk_filter(fp->insns, fp->len);
if (!err) { if (err) {
struct sk_filter *old_fp; 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) rcu_read_lock_bh();
sk_filter_uncharge(sk, fp); old_fp = rcu_dereference(sk->sk_filter);
return err; rcu_assign_pointer(sk->sk_filter, fp);
rcu_read_unlock_bh();
sk_filter_uncharge(sk, old_fp);
return 0;
} }
int sk_detach_filter(struct sock *sk) int sk_detach_filter(struct sock *sk)