diff options
| author | Balazs Scheidler <bazsi@balabit.hu> | 2008-12-07 23:53:46 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-07 23:53:46 -0800 |
| commit | c49b9f295e513753e6d9bb4444ba502f1aa59b29 (patch) | |
| tree | ce46987a31304cf239bd8ee46afbc059cefab5dc /net | |
| parent | 0a0755c9fe47dc9f8271935909c66096e43efbfe (diff) | |
| download | op-kernel-dev-c49b9f295e513753e6d9bb4444ba502f1aa59b29.zip op-kernel-dev-c49b9f295e513753e6d9bb4444ba502f1aa59b29.tar.gz | |
tproxy: fixe a possible read from an invalid location in the socket match
TIME_WAIT sockets need to be handled specially, and the socket match
casted inet_timewait_sock instances to inet_sock, which are not
compatible.
Handle this special case by checking sk->sk_state.
Signed-off-by: Balazs Scheidler <bazsi@balabit.hu>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/xt_socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/xt_socket.c b/net/netfilter/xt_socket.c index 02a8fed..1acc089 100644 --- a/net/netfilter/xt_socket.c +++ b/net/netfilter/xt_socket.c @@ -141,7 +141,7 @@ socket_mt(const struct sk_buff *skb, const struct xt_match_param *par) sk = nf_tproxy_get_sock_v4(dev_net(skb->dev), protocol, saddr, daddr, sport, dport, par->in, false); if (sk != NULL) { - bool wildcard = (inet_sk(sk)->rcv_saddr == 0); + bool wildcard = (sk->sk_state != TCP_TIME_WAIT && inet_sk(sk)->rcv_saddr == 0); nf_tproxy_put_sock(sk); if (wildcard) |
