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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 7785FC04E53 for ; Wed, 15 May 2019 11:50:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3F78020578 for ; Wed, 15 May 2019 11:50:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557921052; bh=sDiO5l3AAV6W+m0k+TpDaXZsjbUGzwUgt7IamaM5LEY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=azEIsRKJoPu4yy6CH2cgtR0cc/+trN85kUen7QvZL9QGuZbFOGpP4VmgAzzKsV4Ql pifmJMqcM5VffzTQFBfPoxHTmtlSOCz+ILjMvzlpDrIc1pYH1gzQNaOJJMzDYx4ggS BrqxC4dCVWESO5qzdYBXCA9ucu434/zqGp2bUK3g= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731394AbfEOLWD (ORCPT ); Wed, 15 May 2019 07:22:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:60178 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731147AbfEOLWD (ORCPT ); Wed, 15 May 2019 07:22:03 -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 2431921734; Wed, 15 May 2019 11:22:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557919322; bh=sDiO5l3AAV6W+m0k+TpDaXZsjbUGzwUgt7IamaM5LEY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=POVofSZQYFNoSDoUHWpeYqeULhvXCQxBSBTOYUBX0J6A9eqIjKB2Ba8BUtBXE53gC Thk0VPaFtyfxOePx15jqi5i7HFQEFb8YJutjqeVVUtypmP2s9Vm4qNWYBFQ1/4u0Nc +QJPqkABvz2hK3VZqK9GgqPX27R3R8a6SDzFAWOE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tetsuo Handa , "David S. Miller" , Sasha Levin Subject: [PATCH 4.19 030/113] mISDN: Check address length before reading address family Date: Wed, 15 May 2019 12:55:21 +0200 Message-Id: <20190515090655.839119619@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190515090652.640988966@linuxfoundation.org> References: <20190515090652.640988966@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ 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 18c0a1281914f..b2abc44fa5cb8 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