Commit a3bdb549 authored by Dmitry Popov's avatar Dmitry Popov Committed by David S. Miller

tcp: cookie transactions setsockopt memory leak

There is a bug in do_tcp_setsockopt(net/ipv4/tcp.c),
TCP_COOKIE_TRANSACTIONS case.
In some cases (when tp->cookie_values == NULL) new tcp_cookie_values
structure can be allocated (at cvp), but not bound to
tp->cookie_values. So a memory leak occurs.
Signed-off-by: default avatarDmitry Popov <dp@highloadlab.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent eeaf61d8
...@@ -2176,6 +2176,8 @@ static int do_tcp_setsockopt(struct sock *sk, int level, ...@@ -2176,6 +2176,8 @@ static int do_tcp_setsockopt(struct sock *sk, int level,
GFP_KERNEL); GFP_KERNEL);
if (cvp == NULL) if (cvp == NULL)
return -ENOMEM; return -ENOMEM;
kref_init(&cvp->kref);
} }
lock_sock(sk); lock_sock(sk);
tp->rx_opt.cookie_in_always = tp->rx_opt.cookie_in_always =
...@@ -2190,12 +2192,11 @@ static int do_tcp_setsockopt(struct sock *sk, int level, ...@@ -2190,12 +2192,11 @@ static int do_tcp_setsockopt(struct sock *sk, int level,
*/ */
kref_put(&tp->cookie_values->kref, kref_put(&tp->cookie_values->kref,
tcp_cookie_values_release); tcp_cookie_values_release);
kref_init(&cvp->kref);
tp->cookie_values = cvp;
} else { } else {
cvp = tp->cookie_values; cvp = tp->cookie_values;
} }
} }
if (cvp != NULL) { if (cvp != NULL) {
cvp->cookie_desired = ctd.tcpct_cookie_desired; cvp->cookie_desired = ctd.tcpct_cookie_desired;
...@@ -2209,6 +2210,8 @@ static int do_tcp_setsockopt(struct sock *sk, int level, ...@@ -2209,6 +2210,8 @@ static int do_tcp_setsockopt(struct sock *sk, int level,
cvp->s_data_desired = ctd.tcpct_s_data_desired; cvp->s_data_desired = ctd.tcpct_s_data_desired;
cvp->s_data_constant = 0; /* false */ cvp->s_data_constant = 0; /* false */
} }
tp->cookie_values = cvp;
} }
release_sock(sk); release_sock(sk);
return err; return err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment