diff options
| author | JP Abgrall <jpa@google.com> | 2013-02-20 16:38:34 -0800 |
|---|---|---|
| committer | Arve Hjønnevåg <arve@android.com> | 2013-02-22 15:27:53 -0800 |
| commit | e7f415eadf62add0340ba59b4f6fcaa8c126da7f (patch) | |
| tree | 30cfa6e4bd6084fa2430362a93ae61b6cad8b1cc | |
| parent | 2b9b0b6a95cb7adbdd4fa03bff2c7dec86852aa0 (diff) | |
| download | common-deprecated/experimental/android-3.8.tar.gz | |
netfilter: xt_qtaguid: fix bad tcp_time_wait sock handlingexperimental/android-3.8deprecated/experimental/android-3.8
Since (41063e9 ipv4: Early TCP socket demux), skb's can have an sk which
is not a struct sock but the smaller struct inet_timewait_sock without an
sk->sk_socket. Now we bypass sk_state == TCP_TIME_WAIT
Signed-off-by: JP Abgrall <jpa@google.com>
| -rw-r--r-- | net/netfilter/xt_qtaguid.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/net/netfilter/xt_qtaguid.c b/net/netfilter/xt_qtaguid.c index 992a6e044902..1b60fdd532d6 100644 --- a/net/netfilter/xt_qtaguid.c +++ b/net/netfilter/xt_qtaguid.c @@ -1693,14 +1693,13 @@ static struct sock *qtaguid_find_sk(const struct sk_buff *skb, return NULL; } - /* - * Seems to be issues on the file ptr for TCP_TIME_WAIT SKs. - * http://kerneltrap.org/mailarchive/linux-netdev/2010/10/21/6287959 - * Not fixed in 3.0-r3 :( - */ if (sk) { MT_DEBUG("qtaguid: %p->sk_proto=%u " "->sk_state=%d\n", sk, sk->sk_protocol, sk->sk_state); + /* + * When in TCP_TIME_WAIT the sk is not a "struct sock" but + * "struct inet_timewait_sock" which is missing fields. + */ if (sk->sk_state == TCP_TIME_WAIT) { xt_socket_put_sk(sk); sk = NULL; @@ -1784,6 +1783,13 @@ static bool qtaguid_mt(const struct sk_buff *skb, struct xt_action_param *par) } sk = skb->sk; + /* + * When in TCP_TIME_WAIT the sk is not a "struct sock" but + * "struct inet_timewait_sock" which is missing fields. + * So we ignore it. + */ + if (sk && sk->sk_state == TCP_TIME_WAIT) + sk = NULL; if (sk == NULL) { /* * A missing sk->sk_socket happens when packets are in-flight |