| Message ID | 4FABAB69.70401@parallels.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Thu, 2012-05-10 at 15:50 +0400, Pavel Emelyanov wrote: > As noted by Eric, no checks are performed on the data size we're > putting in the read queue during repair. Thus, validate the given > data size with the common rmem management routine. > > Signed-off-by: Pavel Emelyanov <xemul@parallels.com> > --- > net/ipv4/tcp_input.c | 3 +++ > 1 files changed, 3 insertions(+), 0 deletions(-) Acked-by: Eric Dumazet <edumazet@google.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Eric Dumazet <eric.dumazet@gmail.com> Date: Thu, 10 May 2012 14:00:29 +0200 > On Thu, 2012-05-10 at 15:50 +0400, Pavel Emelyanov wrote: >> As noted by Eric, no checks are performed on the data size we're >> putting in the read queue during repair. Thus, validate the given >> data size with the common rmem management routine. >> >> Signed-off-by: Pavel Emelyanov <xemul@parallels.com> >> --- >> net/ipv4/tcp_input.c | 3 +++ >> 1 files changed, 3 insertions(+), 0 deletions(-) > > Acked-by: Eric Dumazet <edumazet@google.com> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 7c6c99d..164659f 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -4769,6 +4769,9 @@ int tcp_send_rcvq(struct sock *sk, struct msghdr *msg, size_t size) struct tcphdr *th; bool fragstolen; + if (tcp_try_rmem_schedule(sk, size + sizeof(*th))) + goto err; + skb = alloc_skb(size + sizeof(*th), sk->sk_allocation); if (!skb) goto err;
As noted by Eric, no checks are performed on the data size we're putting in the read queue during repair. Thus, validate the given data size with the common rmem management routine. Signed-off-by: Pavel Emelyanov <xemul@parallels.com> --- net/ipv4/tcp_input.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)