Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp672512img; Fri, 22 Mar 2019 06:19:19 -0700 (PDT) X-Google-Smtp-Source: APXvYqwQD3lCf5JM/C+p+A+yNAjT8/PulR7voNBNlib69PFmfx89FeWiPZw2Is+aDRR3NLLma71i X-Received: by 2002:a63:594a:: with SMTP id j10mr8902935pgm.279.1553260759266; Fri, 22 Mar 2019 06:19:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553260759; cv=none; d=google.com; s=arc-20160816; b=jDaDF9teRXBqZms0X1zX2qtx0v/vaSGDmnL09dn8DWyhQZxcovj5ZLMUCxuwhfSqwe VxvXPJ/0buQzUi/XyCw7+4XADrv9+yy+oKm/nLEAIpZV/c9+pvqgYOHwaOtLTYVUtt5j 0IzkS/OkdAgBV7iyhOnzqHbra5vZrsXf5ivJ+0SgeuKLjgB4iWE2/geZrw0BJWedZKPj svmp+REXWOqXHkwhQiryLlsMogCuZa8ZixBbjmtwQHXu+xhx2AbNDMgo3n4N3pbgAN4o syxCmWefCraTd5icFiexH2XrH0kTA/VDIPSUowtfGi5iTFqKGgn8McMLecPPXcXaG+/k K+yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=pIblmj+2YQCOjb3gXkF4dksRCjw5JbD+I1R0Ek6PEQs=; b=tzoPjGLkp1D2HcomJm63it21Tsd6VBgIIeMZKjyNRMijf9HPCNv1rD/VE4IsRGfNbV LBYqTiPOidtUbZJvqqJdhY0fLRQ0PT9Z1iQ30zCB63WPMYbbfOkyCvQWEeiJ/zoYPYDR lxg4fMsLMBG9rr1OGC4GboGLJn3RNE5attYPBl/e91DxpGCss4naARhAl2b2b2XRAJfy JHvkVk96494dRkKsgZPAADoJUIe3Mf1wF5DFeKeTpmRF1j/Pcb+ohGxLbQ43WBAtiGIF bY9BHH3dYgVKofRNmCmuhq8camVytP+AJufHekimNZVfd3RbUud080fBtiLJSEbQl+1T iBXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Z4dg4aTN; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b31si6812407pgl.5.2019.03.22.06.19.01; Fri, 22 Mar 2019 06:19:19 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Z4dg4aTN; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729130AbfCVLYb (ORCPT + 99 others); Fri, 22 Mar 2019 07:24:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:51542 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728470AbfCVLY3 (ORCPT ); Fri, 22 Mar 2019 07:24:29 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B7B40218B0; Fri, 22 Mar 2019 11:24:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553253868; bh=HWuBMrmCuCaex2M05YQuVj/1vb+yqyTGCTPKwsmp4yM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z4dg4aTNYE8opJavugHw3HX1VLbyPno/tQfGcCaIOHJnyAYP0BN+EbM8FQ8niWTH3 wS50nni/XfRAGaJ/f4AhcakQqh71juGpuzdbTyCd/dH+jpkG5KjdxVX+8/t9F799R8 6569ilRnFpEWlGYW5jDx2L1BM2gtMDjdJmsb2xvk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, linmiaohe , "David S. Miller" Subject: [PATCH 3.18 081/134] net: sit: fix UBSAN Undefined behaviour in check_6rd Date: Fri, 22 Mar 2019 12:14:54 +0100 Message-Id: <20190322111215.971116618@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111210.465931067@linuxfoundation.org> References: <20190322111210.465931067@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Miaohe Lin [ Upstream commit a843dc4ebaecd15fca1f4d35a97210f72ea1473b ] In func check_6rd,tunnel->ip6rd.relay_prefixlen may equal to 32,so UBSAN complain about it. UBSAN: Undefined behaviour in net/ipv6/sit.c:781:47 shift exponent 32 is too large for 32-bit type 'unsigned int' CPU: 6 PID: 20036 Comm: syz-executor.0 Not tainted 4.19.27 #2 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1ubuntu1 04/01/2014 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0xca/0x13e lib/dump_stack.c:113 ubsan_epilogue+0xe/0x81 lib/ubsan.c:159 __ubsan_handle_shift_out_of_bounds+0x293/0x2e8 lib/ubsan.c:425 check_6rd.constprop.9+0x433/0x4e0 net/ipv6/sit.c:781 try_6rd net/ipv6/sit.c:806 [inline] ipip6_tunnel_xmit net/ipv6/sit.c:866 [inline] sit_tunnel_xmit+0x141c/0x2720 net/ipv6/sit.c:1033 __netdev_start_xmit include/linux/netdevice.h:4300 [inline] netdev_start_xmit include/linux/netdevice.h:4309 [inline] xmit_one net/core/dev.c:3243 [inline] dev_hard_start_xmit+0x17c/0x780 net/core/dev.c:3259 __dev_queue_xmit+0x1656/0x2500 net/core/dev.c:3829 neigh_output include/net/neighbour.h:501 [inline] ip6_finish_output2+0xa36/0x2290 net/ipv6/ip6_output.c:120 ip6_finish_output+0x3e7/0xa20 net/ipv6/ip6_output.c:154 NF_HOOK_COND include/linux/netfilter.h:278 [inline] ip6_output+0x1e2/0x720 net/ipv6/ip6_output.c:171 dst_output include/net/dst.h:444 [inline] ip6_local_out+0x99/0x170 net/ipv6/output_core.c:176 ip6_send_skb+0x9d/0x2f0 net/ipv6/ip6_output.c:1697 ip6_push_pending_frames+0xc0/0x100 net/ipv6/ip6_output.c:1717 rawv6_push_pending_frames net/ipv6/raw.c:616 [inline] rawv6_sendmsg+0x2435/0x3530 net/ipv6/raw.c:946 inet_sendmsg+0xf8/0x5c0 net/ipv4/af_inet.c:798 sock_sendmsg_nosec net/socket.c:621 [inline] sock_sendmsg+0xc8/0x110 net/socket.c:631 ___sys_sendmsg+0x6cf/0x890 net/socket.c:2114 __sys_sendmsg+0xf0/0x1b0 net/socket.c:2152 do_syscall_64+0xc8/0x580 arch/x86/entry/common.c:290 entry_SYSCALL_64_after_hwframe+0x49/0xbe Signed-off-by: linmiaohe Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/ipv6/sit.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -771,8 +771,9 @@ static bool check_6rd(struct ip_tunnel * pbw0 = tunnel->ip6rd.prefixlen >> 5; pbi0 = tunnel->ip6rd.prefixlen & 0x1f; - d = (ntohl(v6dst->s6_addr32[pbw0]) << pbi0) >> - tunnel->ip6rd.relay_prefixlen; + d = tunnel->ip6rd.relay_prefixlen < 32 ? + (ntohl(v6dst->s6_addr32[pbw0]) << pbi0) >> + tunnel->ip6rd.relay_prefixlen : 0; pbi1 = pbi0 - tunnel->ip6rd.relay_prefixlen; if (pbi1 > 0)