From patchwork Sat Sep 28 21:59:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Pali_Roh=C3=A1r?= X-Patchwork-Id: 1990528 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=V/a4gQ0p; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=139.178.88.99; helo=sv.mirrors.kernel.org; envelope-from=linux-cifs+bounces-2950-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org [139.178.88.99]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XGLrG4xCLz1xtT for ; Sun, 29 Sep 2024 08:01:02 +1000 (AEST) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id DA0B0285826 for ; Sat, 28 Sep 2024 22:01:00 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3316118785C; Sat, 28 Sep 2024 22:00:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="V/a4gQ0p" X-Original-To: linux-cifs@vger.kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0B22618734F; Sat, 28 Sep 2024 22:00:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727560848; cv=none; b=iA1buqDIWkHbRjR+t9eK3gk7U2B5Ak3FxTX4LdEbdt7YObZ/G5Rh1tYsSaF3X7AkCP3cTg1uXTJWU9rCH4DIao/L+QHvaJn19rphXX/jkOEXHPiXb+cC82/rsB+06LMJdxyLXZ/ZL4yAHc5l0NHz0JH2xPdPa+rosBHlSuiTZWM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727560848; c=relaxed/simple; bh=CzIXaOQ1+8uUZLsrIfoiPMK2AQjdBSqSjgcG93qH1FY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=hPVQdE0MCAqj4ekPTZuTdKRdaDlJ1Rvs1KM/z1E/9/A2j1VlgDpvK7ODX08NAhBBSrC9BhbUbSNG5zndUhaY4HuavawxL7+9xkU8RbBJBkmOvJGiP122Nj35fJzKjB4Rn4vELYkT7ot5bNKRkcHcqHtZqUu5cIFjfeTVCuTGrD0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=V/a4gQ0p; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9F544C4AF09; Sat, 28 Sep 2024 22:00:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1727560847; bh=CzIXaOQ1+8uUZLsrIfoiPMK2AQjdBSqSjgcG93qH1FY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V/a4gQ0pdnp4dwFv61YWJszsVVZdGy00Q94RFCwO7i5HE/gmOzM8e138zYPXskt9g C0VsdQW1WnNKcJix8IVGijtjc+D1Fonmy+e65ZmdK9mwCM9BQvQFBZHXzTM3KRsX5w y/EhumfhyTUNQd6/sA0fmc84Lr9kWhIoOnfw4XAg4EdtiedyWcF+ct6lVWEjubHcxu mkieL8a6e2zeOxjZM26dXJixlDizjH8ctODbN3FiSROVSRZWj5bnzf+Kf6z2TgU5kT wy9ovN5m4vkVW+Ji+NxGt59sZBjaoBNTCsBFGWU+eGZO9D8X9Avt5m3lS76l0tHXgP 9GQy7SeQLQ3CA== Received: by pali.im (Postfix) id C6287A7F; Sun, 29 Sep 2024 00:00:40 +0200 (CEST) From: =?utf-8?q?Pali_Roh=C3=A1r?= To: Steve French , Paulo Alcantara , Ronnie Sahlberg Cc: linux-cifs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/8] cifs: Fix parsing NFS-style char/block devices Date: Sat, 28 Sep 2024 23:59:43 +0200 Message-Id: <20240928215948.4494-4-pali@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20240928215948.4494-1-pali@kernel.org> References: <20240928215948.4494-1-pali@kernel.org> Precedence: bulk X-Mailing-List: linux-cifs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Linux SMB client currently parses NFS-style char and block devices incorrectly. It reads major number from location of minor and major from location of minor. Per MS-FSCC 2.1.2.6 NFS_SPECFILE_CHR and NFS_SPECFILE_BLK DataBuffer's field contains two 32-bit integers that represent major and minor device numbers. So the first one 32-bit integer in DataBuffer is major number and second one in DataBuffer is minor number. Microsoft Windows NFS server reads them in this order too. This issue was introduced in commit 45e724022e27 ("smb: client: set correct file type from NFS reparse points") and probably because in commit message was test of char and block devices with same major and minor numbers. So swapped major and minor numbers were not spotted. Fix this problem in Linux SMB client by reading major and minor numbers from correct position of DataBuffer. This change fixes interoperability of char and block devices on Windows share which is exported over both SMB and NFS protocols. Fixes: 45e724022e27 ("smb: client: set correct file type from NFS reparse points") Signed-off-by: Pali Rohár --- fs/smb/client/reparse.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fs/smb/client/reparse.h b/fs/smb/client/reparse.h index 2c0644bc4e65..790360f8a53b 100644 --- a/fs/smb/client/reparse.h +++ b/fs/smb/client/reparse.h @@ -20,9 +20,12 @@ static inline dev_t reparse_nfs_mkdev(struct reparse_posix_data *buf) { - u64 v = le64_to_cpu(*(__le64 *)buf->DataBuffer); + u32 major, minor; - return MKDEV(v >> 32, v & 0xffffffff); + major = le32_to_cpu(((__le32 *)buf->DataBuffer)[0]); + minor = le32_to_cpu(((__le32 *)buf->DataBuffer)[1]); + + return MKDEV(major, minor); } static inline dev_t wsl_mkdev(void *ptr)