From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AB8JxZraaESi32rLpit/3/cR94d2a5akqAYqgk9pA/TF/Ta1dSZ3hhiBr/PcHUrw0aO6V3JtteX9 ARC-Seal: i=1; a=rsa-sha256; t=1526280906; cv=none; d=google.com; s=arc-20160816; b=nawdqV57FCTHx6yuU80zkpQDE1buHI23gEmfyQhxXj7Jq90W+eCp8InKj+1F92djZE GRXwIRT04sfJ+YH0J4Ckorlsm4UQs9ASWXdEbLUeLJOpyl1mDFH+/Vt1K/J6H+8vX9Z4 BZT/5Uu24EvsguU4k6Hk9IJVC3LXhR4rSKloi8ViBBHGg3HRqOTFdZDV9TxS8So7K/XB 8DDQPfbOH1Zok8NQmA2QzfuIzuTtLVtoy4cwjIyAoTnW2+4D857WbWNPCYNhd1YSjLQP K1dqKyv9kIvwW09fnJcEl/7xcp9ZbYVfd3qMxdT0ZNb+ZFgAWKYC6Fk2mVinaUYRYwQD dn7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=Of1R19FpZ+Jy80N3mUFBBzfauDxZTasZn311Hc4BlQA=; b=CS1n+PTRK3xLmZ6AW2a1L64wFN2x5F5AMsWJoKHewCrcEtz6Yphf+Mrg1n2lUmh92o BDRJVF+AmPi8esAwYcFH/KEjfbkY3caQsGOy+DHLcLzXJcpWMKjNfc/Ou8HXVrO0QjAC voJ5NgvLbOw1lnd05AhTlSEaRFiYPWw3cVzP7t89WfylTtBWN8Phj5t7FmxsumDRNQh7 ZgnFyjrJTMGkUs7lVluu94EXneZAtfAmBpTlSAVwge04yMj+juRwRXRmGq6ucLtL8aYm l80Cv9tJq9cH+oolxtMLPZ3U9yKnUo8O59UIddnsuAu+SJDLXCBS71YXkINZTD7GqgSk Mt8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=04vTARQ7; spf=pass (google.com: domain of srs0=ywzk=ib=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=ywzk=IB=linuxfoundation.org=gregkh@kernel.org Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=04vTARQ7; spf=pass (google.com: domain of srs0=ywzk=ib=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=ywzk=IB=linuxfoundation.org=gregkh@kernel.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eric Dumazet , syzbot , Pavel Emelyanov , "David S. Miller" Subject: [PATCH 4.9 12/36] tcp: fix TCP_REPAIR_QUEUE bound checking Date: Mon, 14 May 2018 08:48:46 +0200 Message-Id: <20180514064805.199097707@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180514064804.252823817@linuxfoundation.org> References: <20180514064804.252823817@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1600421256400782370?= X-GMAIL-MSGID: =?utf-8?q?1600421527216589948?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Eric Dumazet 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 Reported-by: syzbot Cc: Pavel Emelyanov Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/ipv4/tcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -2523,7 +2523,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;