提交 d3904b73 编写于 作者: P Pavel Emelyanov 提交者: David S. Miller

[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: NPavel Emelyanov <xemul@openvz.org>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 309dd5fc
...@@ -398,7 +398,7 @@ int sk_chk_filter(struct sock_filter *filter, int flen) ...@@ -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) ...@@ -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(); rcu_read_lock_bh();
old_fp = rcu_dereference(sk->sk_filter); old_fp = rcu_dereference(sk->sk_filter);
rcu_assign_pointer(sk->sk_filter, fp); rcu_assign_pointer(sk->sk_filter, fp);
rcu_read_unlock_bh(); rcu_read_unlock_bh();
fp = old_fp;
}
if (fp) sk_filter_uncharge(sk, old_fp);
sk_filter_uncharge(sk, fp); return 0;
return err;
} }
int sk_detach_filter(struct sock *sk) int sk_detach_filter(struct sock *sk)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册
新手
引导
客服 返回
顶部