From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 31FA2C004C9 for ; Tue, 7 May 2019 05:36:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DBED0214AE for ; Tue, 7 May 2019 05:36:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557207406; bh=PAJbD/nVxOh97/0w5rpO4ePGdhs/onBSViaK+uXO4gY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=JBwKaNJnShlNoaHe6dlWNlWJUyX+LGQyPdmC8Vti9u3mtEOpodHLVJekYFQTggtiR h4pYP78wbZTlEAlFOmi4uGlJktsKSDecpZousI9T2biZuVQnIKNoyaZCLkii35pBz2 rfHL7nquDllm4crXLRpx41XAXd0DaM9Vbz+jqhsY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728156AbfEGFgo (ORCPT ); Tue, 7 May 2019 01:36:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:56542 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728142AbfEGFgm (ORCPT ); Tue, 7 May 2019 01:36:42 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 14C4420989; Tue, 7 May 2019 05:36:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557207401; bh=PAJbD/nVxOh97/0w5rpO4ePGdhs/onBSViaK+uXO4gY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EYg91JQpUvw3BCudCUYNOpBvwMlvg1uNoxGJTzhNqOmw/puo9KK6qHkwWzTdc3PfK 2YKvdB5awOw6ME4SDIbWA8pvkjJ7P4EetcM2aqqCiKXgt2w3wyiSMO1TYYbjh14I2v cFKmmbFxXtiUCsp7aWwbbu8u8DfiaIVCWTh+7MVY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tetsuo Handa , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 24/81] mISDN: Check address length before reading address family Date: Tue, 7 May 2019 01:34:55 -0400 Message-Id: <20190507053554.30848-24-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190507053554.30848-1-sashal@kernel.org> References: <20190507053554.30848-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Tetsuo Handa [ Upstream commit 238ffdc49ef98b15819cfd5e3fb23194e3ea3d39 ] KMSAN will complain if valid address length passed to bind() is shorter than sizeof("struct sockaddr_mISDN"->family) bytes. Signed-off-by: Tetsuo Handa Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/isdn/mISDN/socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c index 18c0a1281914..b2abc44fa5cb 100644 --- a/drivers/isdn/mISDN/socket.c +++ b/drivers/isdn/mISDN/socket.c @@ -711,10 +711,10 @@ base_sock_bind(struct socket *sock, struct sockaddr *addr, int addr_len) struct sock *sk = sock->sk; int err = 0; - if (!maddr || maddr->family != AF_ISDN) + if (addr_len < sizeof(struct sockaddr_mISDN)) return -EINVAL; - if (addr_len < sizeof(struct sockaddr_mISDN)) + if (!maddr || maddr->family != AF_ISDN) return -EINVAL; lock_sock(sk); -- 2.20.1