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=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,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 08379C43219 for ; Sat, 27 Apr 2019 01:44:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C60B9208CB for ; Sat, 27 Apr 2019 01:44:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556329473; bh=3YuD6cEFA2Y8RbHmmkAe6NdAipGDVMoYYZ3PddjOa+U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=clx2pUMDPBPHFMFtSJv9+owksd01ilztnjykkOtr3v66ImG8pkV/EbHYZOyN9v+Lx YJGSXm2RUEmquS/s1gJs6ruqh6E/8LfmX1Qb8AT2ksgqAwDgY3ctue0C6Ew8CM+o4C LoO/0cWopP/xwPAdCWLB9B5NUW8ifTE9OAaXvBXE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729038AbfD0Bod (ORCPT ); Fri, 26 Apr 2019 21:44:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:48782 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728643AbfD0BoZ (ORCPT ); Fri, 26 Apr 2019 21:44:25 -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 7C06E215EA; Sat, 27 Apr 2019 01:44:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556329464; bh=3YuD6cEFA2Y8RbHmmkAe6NdAipGDVMoYYZ3PddjOa+U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K81gwLSutldKOzRXuDqzMDTUH7jjapC+29NhCyPW0Gn4mPowiIVM5rRNHRfSryxiB 5Dcx+IVLpNApvG9FHg6AdHGOREsWGkzvr6d5nX9/IquaJE2pqBsFDsAzbj15QzVjLs XW3BW+1fPjEUsWCYe1X915UMWPhlm3UqqAi3o1Jc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tetsuo Handa , Trond Myklebust , Sasha Levin , linux-nfs@vger.kernel.org Subject: [PATCH AUTOSEL 3.18 7/8] NFS: Forbid setting AF_INET6 to "struct sockaddr_in"->sin_family. Date: Fri, 26 Apr 2019 21:44:10 -0400 Message-Id: <20190427014412.9091-7-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190427014412.9091-1-sashal@kernel.org> References: <20190427014412.9091-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tetsuo Handa [ Upstream commit 7c2bd9a39845bfb6d72ddb55ce737650271f6f96 ] syzbot is reporting uninitialized value at rpc_sockaddr2uaddr() [1]. This is because syzbot is setting AF_INET6 to "struct sockaddr_in"->sin_family (which is embedded into user-visible "struct nfs_mount_data" structure) despite nfs23_validate_mount_data() cannot pass sizeof(struct sockaddr_in6) bytes of AF_INET6 address to rpc_sockaddr2uaddr(). Since "struct nfs_mount_data" structure is user-visible, we can't change "struct nfs_mount_data" to use "struct sockaddr_storage". Therefore, assuming that everybody is using AF_INET family when passing address via "struct nfs_mount_data"->addr, reject if its sin_family is not AF_INET. [1] https://syzkaller.appspot.com/bug?id=599993614e7cbbf66bc2656a919ab2a95fb5d75c Reported-by: syzbot Signed-off-by: Tetsuo Handa Signed-off-by: Trond Myklebust Signed-off-by: Sasha Levin --- fs/nfs/super.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/nfs/super.c b/fs/nfs/super.c index d2fcd6e9d675..d70b4ed1b936 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -2019,7 +2019,8 @@ static int nfs23_validate_mount_data(void *options, memcpy(sap, &data->addr, sizeof(data->addr)); args->nfs_server.addrlen = sizeof(data->addr); args->nfs_server.port = ntohs(data->addr.sin_port); - if (!nfs_verify_server_address(sap)) + if (sap->sa_family != AF_INET || + !nfs_verify_server_address(sap)) goto out_no_address; if (!(data->flags & NFS_MOUNT_TCP)) -- 2.19.1