From patchwork Mon Jun 24 16:36:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 807048 Delivered-To: patch@linaro.org Received: by 2002:a5d:508d:0:b0:362:4979:7f74 with SMTP id a13csp1969742wrt; Mon, 24 Jun 2024 09:37:42 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUPkfMZemZO41HwX6tTdFFuHThxJTK+XhutZPOElol/vUYexd2f2AtFn/VWvcf6gQLtUnV6TqfmFSUY60+QObvA X-Google-Smtp-Source: AGHT+IEK0KfsH3jd7Z6Cf6pDWXwhWkwsH00tMYSP/wCpwTVJ468dCE/YBlH0o4BaNOB02A4WejVA X-Received: by 2002:a05:620a:400a:b0:798:da69:81eb with SMTP id af79cd13be357-79be701ff00mr577305985a.72.1719247062600; Mon, 24 Jun 2024 09:37:42 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1719247062; cv=pass; d=google.com; s=arc-20160816; b=F0rnGRGSfvfefCcBkFlLj4kbtRWINkjVmnoWWxEepkvGBufQ2OPHY4hwuNHWrAM1zd nFcgOnzntlQfuLhuBEd4q6QcRVzM9thYv0KsE0aE393c04XMzCB11gylN4TM6Ya+f7dV L+eK6Gs/iRqTDvXWC0tLamCcVm+J4yM0r6ex6cZNPfH1J38VqhOXg6AsxBKlBBPqpm02 krUNdEPSP9winpkyd7VkGb2a33rsWiX9pnLcgp/X3YD60hO2CLrdtoO1lBJ5a0Chkpbl N0xCpnUXYIGTbTa31pfAfilnVIbUgaigTZ7nj//DjAENy0vg7YhjFvDw5y8nZAHL2KIp CX0A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature:arc-filter:dmarc-filter:delivered-to; bh=r+6FPULjZT5I8D1LgGDwp73dJViV8Kc5kVYg6/29MAM=; fh=oUdlCGl+3qy3cXVPxX2rni00O5FZdQ9LfqUzmQ4bHLM=; b=woO8Owoykppw7rSBZ0x9IVVdO8A5XjHCpaOtTzo5gdoRQwCvDj+nJmIB46aCVsNj4N sCPXP17UPPgaLeh6Kr1xxwCgBhYT2DFtbnVha9nCwmGX9vatuoNkrvMnt2VA2NVE3XFd 4vKqA0Bjg1jUdKOLIJNnbXhZ85jD4eJyDDmowirTvYjXRa9Q8FWzHvc5xPF+dA/e946F 2hunhqDZFT+yb/yml8h8etR/HZI5/dUyPhuklZQCO4p0unnEvYs3OG0sku+E/1Uo1Irp fA0Sfa7Fq6OCwJbDJ8Pf45xT+3JNV5l+JlPeqKphS9TZNDj1kH6/FPw6RGEGUSaxuIov 4Gmw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=FhTmssAm; arc=pass (i=1); spf=pass (google.com: domain of libc-alpha-bounces+patch=linaro.org@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="libc-alpha-bounces+patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id af79cd13be357-79bce88286fsi878538785a.111.2024.06.24.09.37.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jun 2024 09:37:42 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-bounces+patch=linaro.org@sourceware.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=FhTmssAm; arc=pass (i=1); spf=pass (google.com: domain of libc-alpha-bounces+patch=linaro.org@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="libc-alpha-bounces+patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 27F3B384AB44 for ; Mon, 24 Jun 2024 16:37:42 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by sourceware.org (Postfix) with ESMTPS id 38A85385840F for ; Mon, 24 Jun 2024 16:37:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 38A85385840F Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=kernel.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 38A85385840F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2604:1380:4641:c500::1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1719247049; cv=none; b=XNMQ2ICzBD+8Kz/I+hgUteic0sC54bBG/PVvW9TP8tzcZXJ5q0RwljkS5R+gIK68Gxvh+DqMzSx3w2Gvl9MMF+oiMuiMWW8O0ZrsPJJK0KU4OwYij+7tfsaFw+h9yFDIRjx4rGz2Wh3I0LoEIx52edxZaXZmo0VNmhh1kYVqnic= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1719247049; c=relaxed/simple; bh=EwPpX0S1DTr+6EvIenNObE+xZCXTGGAFxEeI1J4w98A=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=DiKIrG+JkWkyq9dmUtDB/ktUJhw4Venhn5/uNpO6C6mwX2cvjHxII6wQSrT75OLc8QsvXU76RikF9z88XMcpt9EU345UYU/QuC6GBWHimXlrLKg1TTdkgOAENNoc9ShjlB/7pq3rI+6gEXLd9EwT8jhaEs/jNaqAsFl/jC18Lrs= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id C662260DED; Mon, 24 Jun 2024 16:37:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4B69CC32782; Mon, 24 Jun 2024 16:37:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1719247046; bh=EwPpX0S1DTr+6EvIenNObE+xZCXTGGAFxEeI1J4w98A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FhTmssAmbe2m7XIZuY8gNTeVo+Lkit5BxwKeUJVUTZwbQDs+G38+66PslSvzLgbPX 5VKaiDIhlfUucsc4cjoE7TqvsIBTcMhplYbPShFl5s9bpnQzl7TNnyubJlrQWYBJtL +/n0rSYNeyLLM8kjj7zO4V6y9CBf8tcSacuRTYHi/44G5yRnMmt4Ieqoj6GlBy9sPc dZ2nLCKQKHprpGR0yeVZy2oKdDUOIcxuh6Y4DBO8vU3exBZJH7F0XMADo/asFimmTq sKPNph/E2CBt9PEnVWdZ6rFALDcWj8IxJTdgWx9kRIgFVlh8ERnRYJV9VwZ/nU3ne/ suhAPd1WlO1Pw== From: Arnd Bergmann To: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Arnd Bergmann , Thomas Bogendoerfer , linux-mips@vger.kernel.org, Helge Deller , linux-parisc@vger.kernel.org, "David S. Miller" , Andreas Larsson , sparclinux@vger.kernel.org, Michael Ellerman , Nicholas Piggin , Christophe Leroy , "Naveen N . Rao" , linuxppc-dev@lists.ozlabs.org, Brian Cain , linux-hexagon@vger.kernel.org, Guo Ren , linux-csky@vger.kernel.org, Heiko Carstens , linux-s390@vger.kernel.org, Rich Felker , John Paul Adrian Glaubitz , linux-sh@vger.kernel.org, "H. Peter Anvin" , Alexander Viro , Christian Brauner , linux-fsdevel@vger.kernel.org, libc-alpha@sourceware.org, musl@lists.openwall.com, stable@vger.kernel.org Subject: [PATCH v2 01/13] ftruncate: pass a signed offset Date: Mon, 24 Jun 2024 18:36:59 +0200 Message-Id: <20240624163707.299494-2-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240624163707.299494-1-arnd@kernel.org> References: <20240624163707.299494-1-arnd@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patch=linaro.org@sourceware.org From: Arnd Bergmann The old ftruncate() syscall, using the 32-bit off_t misses a sign extension when called in compat mode on 64-bit architectures. As a result, passing a negative length accidentally succeeds in truncating to file size between 2GiB and 4GiB. Changing the type of the compat syscall to the signed compat_off_t changes the behavior so it instead returns -EINVAL. The native entry point, the truncate() syscall and the corresponding loff_t based variants are all correct already and do not suffer from this mistake. Fixes: 3f6d078d4acc ("fix compat truncate/ftruncate") Reviewed-by: Christian Brauner Cc: stable@vger.kernel.org Signed-off-by: Arnd Bergmann --- fs/open.c | 4 ++-- include/linux/compat.h | 2 +- include/linux/syscalls.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/open.c b/fs/open.c index 89cafb572061..50e45bc7c4d8 100644 --- a/fs/open.c +++ b/fs/open.c @@ -202,13 +202,13 @@ long do_sys_ftruncate(unsigned int fd, loff_t length, int small) return error; } -SYSCALL_DEFINE2(ftruncate, unsigned int, fd, unsigned long, length) +SYSCALL_DEFINE2(ftruncate, unsigned int, fd, off_t, length) { return do_sys_ftruncate(fd, length, 1); } #ifdef CONFIG_COMPAT -COMPAT_SYSCALL_DEFINE2(ftruncate, unsigned int, fd, compat_ulong_t, length) +COMPAT_SYSCALL_DEFINE2(ftruncate, unsigned int, fd, compat_off_t, length) { return do_sys_ftruncate(fd, length, 1); } diff --git a/include/linux/compat.h b/include/linux/compat.h index 233f61ec8afc..56cebaff0c91 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -608,7 +608,7 @@ asmlinkage long compat_sys_fstatfs(unsigned int fd, asmlinkage long compat_sys_fstatfs64(unsigned int fd, compat_size_t sz, struct compat_statfs64 __user *buf); asmlinkage long compat_sys_truncate(const char __user *, compat_off_t); -asmlinkage long compat_sys_ftruncate(unsigned int, compat_ulong_t); +asmlinkage long compat_sys_ftruncate(unsigned int, compat_off_t); /* No generic prototype for truncate64, ftruncate64, fallocate */ asmlinkage long compat_sys_openat(int dfd, const char __user *filename, int flags, umode_t mode); diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index 9104952d323d..ba9337709878 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h @@ -418,7 +418,7 @@ asmlinkage long sys_listmount(const struct mnt_id_req __user *req, u64 __user *mnt_ids, size_t nr_mnt_ids, unsigned int flags); asmlinkage long sys_truncate(const char __user *path, long length); -asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length); +asmlinkage long sys_ftruncate(unsigned int fd, off_t length); #if BITS_PER_LONG == 32 asmlinkage long sys_truncate64(const char __user *path, loff_t length); asmlinkage long sys_ftruncate64(unsigned int fd, loff_t length);