From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, Eric Dumazet <edumazet@google.com>,
syzbot <syzkaller@googlegroups.com>,
Pavel Emelyanov <xemul@parallels.com>,
"David S. Miller" <davem@davemloft.net>
Subject: [PATCH 4.4 40/56] tcp: fix TCP_REPAIR_QUEUE bound checking
Date: Mon, 14 May 2018 08:48:45 +0200 [thread overview]
Message-ID: <20180514064758.515820440@linuxfoundation.org> (raw)
In-Reply-To: <20180514064754.853201981@linuxfoundation.org>
4.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <edumazet@google.com>
commit bf2acc943a45d2b2e8a9f1a5ddff6b6e43cc69d9 upstream.
syzbot is able to produce a nasty WARN_ON() in tcp_verify_left_out()
with following C-repro :
socket(PF_INET, SOCK_STREAM, IPPROTO_IP) = 3
setsockopt(3, SOL_TCP, TCP_REPAIR, [1], 4) = 0
setsockopt(3, SOL_TCP, TCP_REPAIR_QUEUE, [-1], 4) = 0
bind(3, {sa_family=AF_INET, sin_port=htons(20002), sin_addr=inet_addr("0.0.0.0")}, 16) = 0
sendto(3, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"...,
1242, MSG_FASTOPEN, {sa_family=AF_INET, sin_port=htons(20002), sin_addr=inet_addr("127.0.0.1")}, 16) = 1242
setsockopt(3, SOL_TCP, TCP_REPAIR_WINDOW, "\4\0\0@+\205\0\0\377\377\0\0\377\377\377\177\0\0\0\0", 20) = 0
writev(3, [{"\270", 1}], 1) = 1
setsockopt(3, SOL_TCP, TCP_REPAIR_OPTIONS, "\10\0\0\0\0\0\0\0\0\0\0\0|\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"..., 386) = 0
writev(3, [{"\210v\r[\226\320t\231qwQ\204\264l\254\t\1\20\245\214p\350H\223\254;\\\37\345\307p$"..., 3144}], 1) = 3144
The 3rd system call looks odd :
setsockopt(3, SOL_TCP, TCP_REPAIR_QUEUE, [-1], 4) = 0
This patch makes sure bound checking is using an unsigned compare.
Fixes: ee9952831cfd ("tcp: Initial repair mode")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: syzbot <syzkaller@googlegroups.com>
Cc: Pavel Emelyanov <xemul@parallels.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
net/ipv4/tcp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -2450,7 +2450,7 @@ static int do_tcp_setsockopt(struct sock
case TCP_REPAIR_QUEUE:
if (!tp->repair)
err = -EPERM;
- else if (val < TCP_QUEUES_NR)
+ else if ((unsigned int)val < TCP_QUEUES_NR)
tp->repair_queue = val;
else
err = -EINVAL;
next prev parent reply other threads:[~2018-05-14 6:52 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-14 6:48 [PATCH 4.4 00/56] 4.4.132-stable review Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 01/56] perf/core: Fix the perf_cpu_time_max_percent check Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 02/56] bpf: map_get_next_key to return first key on NULL Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 03/56] KVM: s390: Enable all facility bits that are known good for passthrough Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 04/56] percpu: include linux/sched.h for cond_resched() Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 05/56] mac80211: allow not sending MIC up from driver for HW crypto Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 06/56] mac80211: allow same PN for AMSDU sub-frames Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 07/56] mac80211: Add RX flag to indicate ICV stripped Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 08/56] ath10k: fix rfc1042 header retrieval in QCA4019 with eth decap mode Greg Kroah-Hartman
2018-06-04 17:52 ` Ben Hutchings
2018-06-07 11:52 ` Sriram R
2018-06-07 15:49 ` Ben Hutchings
2018-06-07 16:16 ` Greg Kroah-Hartman
2018-06-07 16:42 ` Ben Hutchings
2018-07-05 16:20 ` Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 09/56] ath10k: rebuild crypto header in rx data frames Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 10/56] gpmi-nand: Handle ECC Errors in erased pages Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 12/56] ALSA: pcm: Check PCM state at xfern compat ioctl Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 13/56] ALSA: seq: Fix races at MIDI encoding in snd_virmidi_output_trigger() Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 14/56] ALSA: aloop: Mark paused device as inactive Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 15/56] ALSA: aloop: Add missing cable lock to ctl API callbacks Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 16/56] tracepoint: Do not warn on ENOMEM Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 17/56] Input: leds - fix out of bound access Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 18/56] Input: atmel_mxt_ts - add touchpad button mapping for Samsung Chromebook Pro Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 19/56] xfs: prevent creating negative-sized file via INSERT_RANGE Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 20/56] RDMA/ucma: Allow resolving address w/o specifying source address Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 21/56] RDMA/mlx5: Protect from shift operand overflow Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 23/56] IB/mlx5: Use unlimited rate when static rate is not supported Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 24/56] drm/vmwgfx: Fix a buffer object leak Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 25/56] test_firmware: fix setting old custom fw path back on exit, second try Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 26/56] USB: serial: visor: handle potential invalid device configuration Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 27/56] USB: Accept bulk endpoints with 1024-byte maxpacket Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 28/56] USB: serial: option: reimplement interface masking Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 30/56] usb: musb: host: fix potential NULL pointer dereference Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 31/56] ipvs: fix rtnl_lock lockups caused by start_sync_thread Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 32/56] crypto: af_alg - fix possible uninit-value in alg_bind() Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 33/56] netlink: fix uninit-value in netlink_sendmsg Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 34/56] net: fix rtnh_ok() Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 35/56] net: initialize skb->peeked when cloning Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 36/56] net: fix uninit-value in __hw_addr_add_ex() Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 37/56] dccp: initialize ireq->ir_mark Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 38/56] soreuseport: initialise timewait reuseport field Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 39/56] perf: Remove superfluous allocation error check Greg Kroah-Hartman
2018-05-14 6:48 ` Greg Kroah-Hartman [this message]
2018-05-14 6:48 ` [PATCH 4.4 41/56] bdi: Fix oops in wb_workfn() Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 42/56] f2fs: fix a dead loop in f2fs_fiemap() Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 43/56] xfrm_user: fix return value from xfrm_user_rcv_msg Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 44/56] rfkill: gpio: fix memory leak in probe error path Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 45/56] libata: Apply NOLPM quirk for SanDisk SD7UB3Q*G1001 SSDs Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 46/56] tracing: Fix regex_match_front() to not over compare the test string Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 47/56] can: kvaser_usb: Increase correct stats counter in kvaser_usb_rx_can_msg() Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 48/56] net: atm: Fix potential Spectre v1 Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 49/56] atm: zatm: " Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 50/56] Revert "Bluetooth: btusb: Fix quirk for Atheros 1525/QCA6174" Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 52/56] perf/x86: Fix possible Spectre-v1 indexing for hw_perf_event cache_* Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 53/56] perf/x86/cstate: Fix possible Spectre-v1 indexing for pkg_msr Greg Kroah-Hartman
2018-05-14 6:48 ` [PATCH 4.4 54/56] perf/x86/msr: Fix possible Spectre-v1 indexing in the MSR driver Greg Kroah-Hartman
2018-05-14 6:49 ` [PATCH 4.4 55/56] perf/core: Fix possible Spectre-v1 indexing for ->aux_pages[] Greg Kroah-Hartman
2018-05-14 6:49 ` [PATCH 4.4 56/56] perf/x86: Fix possible Spectre-v1 indexing for x86_pmu::event_map() Greg Kroah-Hartman
2018-05-14 8:09 ` [PATCH 4.4 00/56] 4.4.132-stable review Nathan Chancellor
2018-05-14 16:20 ` Guenter Roeck
2018-05-14 22:04 ` Shuah Khan
2018-05-15 6:11 ` Naresh Kamboju
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=20180514064758.515820440@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=syzkaller@googlegroups.com \
--cc=xemul@parallels.com \
/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;
as well as URLs for NNTP newsgroup(s).