From: Ben Hutchings <ben@decadent.org.uk>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: akpm@linux-foundation.org, "Eric Dumazet" <edumazet@google.com>,
"David S. Miller" <davem@davemloft.net>,
"Andrey Konovalov" <andreyknvl@google.com>
Subject: [PATCH 3.16 11/12] dccp: fix freeing skb too early for IPV6_RECVPKTINFO
Date: Fri, 24 Feb 2017 12:10:01 +0000 [thread overview]
Message-ID: <lsq.1487938201.934279598@decadent.org.uk> (raw)
In-Reply-To: <lsq.1487938201.529166958@decadent.org.uk>
3.16.41-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Andrey Konovalov <andreyknvl@google.com>
commit 5edabca9d4cff7f1f2b68f0bac55ef99d9798ba4 upstream.
In the current DCCP implementation an skb for a DCCP_PKT_REQUEST packet
is forcibly freed via __kfree_skb in dccp_rcv_state_process if
dccp_v6_conn_request successfully returns.
However, if IPV6_RECVPKTINFO is set on a socket, the address of the skb
is saved to ireq->pktopts and the ref count for skb is incremented in
dccp_v6_conn_request, so skb is still in use. Nevertheless, it gets freed
in dccp_rcv_state_process.
Fix by calling consume_skb instead of doing goto discard and therefore
calling __kfree_skb.
Similar fixes for TCP:
fb7e2399ec17f1004c0e0ccfd17439f8759ede01 [TCP]: skb is unexpectedly freed.
0aea76d35c9651d55bbaf746e7914e5f9ae5a25d tcp: SYN packets are now
simply consumed
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
net/dccp/input.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/net/dccp/input.c
+++ b/net/dccp/input.c
@@ -606,7 +606,8 @@ int dccp_rcv_state_process(struct sock *
if (inet_csk(sk)->icsk_af_ops->conn_request(sk,
skb) < 0)
return 1;
- goto discard;
+ consume_skb(skb);
+ return 0;
}
if (dh->dccph_type == DCCP_PKT_RESET)
goto discard;
next prev parent reply other threads:[~2017-02-24 12:12 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-24 12:10 [PATCH 3.16 00/12] 3.16.41-rc1 review Ben Hutchings
2017-02-24 12:10 ` [PATCH 3.16 06/12] selinux: fix off-by-one in setprocattr Ben Hutchings
2017-02-24 12:10 ` [PATCH 3.16 08/12] tmpfs: clear S_ISGID when setting posix ACLs Ben Hutchings
2017-02-24 12:10 ` [PATCH 3.16 07/12] USB: serial: kl5kusb105: fix line-state error handling Ben Hutchings
2017-02-24 12:10 ` [PATCH 3.16 12/12] tcp: avoid infinite loop in tcp_splice_read() Ben Hutchings
2017-02-24 12:10 ` [PATCH 3.16 09/12] ip6_gre: fix ip6gre_err() invalid reads Ben Hutchings
2017-02-24 12:10 ` [PATCH 3.16 03/12] ext4: validate s_first_meta_bg at mount time Ben Hutchings
2017-02-24 12:10 ` [PATCH 3.16 01/12] mnt: Add a per mount namespace limit on the number of mounts Ben Hutchings
2017-02-24 12:10 ` [PATCH 3.16 10/12] ipv4: keep skb->dst around in presence of IP options Ben Hutchings
2017-02-24 12:10 ` Ben Hutchings [this message]
2017-02-24 12:10 ` [PATCH 3.16 02/12] kvm: nVMX: Allow L1 to intercept software exceptions (#BP and #OF) Ben Hutchings
2017-02-24 12:10 ` [PATCH 3.16 05/12] KVM: x86: Introduce segmented_write_std Ben Hutchings
2017-02-24 12:10 ` [PATCH 3.16 04/12] KVM: x86: fix emulation of "MOV SS, null selector" Ben Hutchings
2017-02-24 16:19 ` [PATCH 3.16 00/12] 3.16.41-rc1 review Guenter Roeck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=lsq.1487938201.934279598@decadent.org.uk \
--to=ben@decadent.org.uk \
--cc=akpm@linux-foundation.org \
--cc=andreyknvl@google.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome