From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AB8JxZrQu8POMdmk1JnrJYWOCegYMJ9zux4z0bYCryEFu8b/n1Pm9dUNhUgEXHTMlz7vXwcdOTQt ARC-Seal: i=1; a=rsa-sha256; t=1526280647; cv=none; d=google.com; s=arc-20160816; b=IjeR9/s7bXfNY4hIKvkueGL2AOMgbEtIUikmpSICgXmFZBqhOlyWw6XnAkV1sPOcTK Ywtw7L09OR/ORUjR6M98T7G3jgNVnksI6roRodzg7o+7SsHdarE9dOJi0h3J5niAazwr Lua8RvEXyPvr54qqjD3a/olZi0ZZjykzzPrhT8M8JpIr7xwT8zMqZjEuJTVsol9thFzc XDHBsI+jbM1fB5v9dQpd9hrLMRdnQtjXLqP3aYz/K/gg9H7eQZ93wuW2S2RNjXXNQSAm ncJ5SETOD8tpxNZqlE6IigAkzUwZOrVTWHZ9x/CSewhwJ8DfpdR/C3IYPZ9fXamV6k1Z fdQA== 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=FBiGbWWyH8C+oUoWWUe7dtrWKHZmIgPT/w3PIt4e2Aw=; b=E8LyCBBLYQVX8n386cTef9kz1IwewTDeg1IEkA2jxxhb5zqiYTiUTVuBtyWd8/mN0J Yp1rJ7lwT2mCeVTEDfuaX2xBdHldurws8PwKjJG/2SQ91x32StN3lTHPLm1/RIOfFuIr wb3kMfWuWyWz/cVmaV6zM85wWCYZDZs0TphREcHUYsrxgbSELBA1fLUjuyt79nfBtk5e 1/HCYLnMDWshADsUUvhoy3/qrSBF1exe4bjr1ZewofNdAYO9VQnsv2MXiZ6EIIES1Isu QRca4jBjmOeieDUlV61LjUPt/TtI2zYkoxMhCuUpDDHCiFpJ5JPQN0meRCFIgRQVEGpT oTYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=KLnI4ZxJ; 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=KLnI4ZxJ; 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 3.18 18/23] tcp: fix TCP_REPAIR_QUEUE bound checking Date: Mon, 14 May 2018 08:48:47 +0200 Message-Id: <20180514064704.818700522@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180514064704.046463679@linuxfoundation.org> References: <20180514064704.046463679@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?1600421256400782370?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 3.18-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 @@ -2461,7 +2461,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;