Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3085890ybt; Mon, 29 Jun 2020 15:00:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzeHO2oF/xL2O471Eis++7OMenQVXaTzNjNR0jAVIeB/G5N9pDWknAihXn/yfJq9I9FlwO0 X-Received: by 2002:a17:906:b813:: with SMTP id dv19mr15386444ejb.119.1593468031102; Mon, 29 Jun 2020 15:00:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593468031; cv=none; d=google.com; s=arc-20160816; b=Y9Aavhr3nPxELiIhnbcehQtysTAqPmICa/kajcP53GZIz4kA/aWbKoAe7hSBiGJmah NnUHzsu/Dmf9q3OfWxsnO5MbFrBA5dcgzXdP24dq4dfrPkUZXUIxg0wgxi0CKkkmLemk uuxN6OpMd85O1nqvdcFKyDrMT0zJ5OMrCW9cQONWQxEuW/JAuHXrCxrm2e1iKt2HrS7H tLvKkBejTrAynB28szyzvOaWUa2+P2VP6USBYnCSaFug23UA23rT1OBXy+aPuFJlmW1p MGXMtrL9tv5QTAJXVBIHZ6ciKt8pd9JDgxo/blQe6bK/2hEYOddymFKRfezGY0eIld/h BOBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=4pj//WrEyTqt8GNhX22rWleJ52L89YhI5pXaRauF5Fw=; b=VD97lXmBX0HhsVQpub6dIvcSQOYD3NUDUB5flU4h4YxI9GzPe7xiZxFr8k9O4iL8fw fdDYlxcl47q4nGsJm+a+uWqS1twAykP02D+UPHQ3NKyx822ld+u3+MYCmL9DhjPezzY+ JkhRtT1A7wjAe1qAYafMFK5XJ20m8X/5prvnvNtuzB2iYr3yW1n7lksGUI7dsEY+n5Lf PHfn5XE/V6a7Em4XBrXQ1ieB0FRRwfMzkR8gvCNR6JyR5J79EPkglXtYVEIz7Om+azFg ksu6ZBP5gv2q1DwtOeXf7q5PzB9begbpfbkwsD7eRN1Wsi/3Z3VFvriX9W4JYcvV8S5C ZJ3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="iOfMOM/w"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e26si562613ejd.180.2020.06.29.15.00.08; Mon, 29 Jun 2020 15:00:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="iOfMOM/w"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391672AbgF2V7J (ORCPT + 99 others); Mon, 29 Jun 2020 17:59:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:56890 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726432AbgF2Sf1 (ORCPT ); Mon, 29 Jun 2020 14:35:27 -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 78D402478F; Mon, 29 Jun 2020 15:21:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593444098; bh=0yx4bJ3B+m+aCTmdxosbdG7iughP3yPsSPVXS6vM4vg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iOfMOM/wPTMIXXwz7q5FBZr+xa/nzrTtnNVmcHvEs/cQPjU/rLGdbofd6y9pxtnoA s1rxBfQaZeqygxc4MBu8HIQTKO6uEbsStnYFp0XM1uz2/UBfAj3DpCynUdYlByHprp kjrtmOO8nEdlNQinBR/s8QJvS3rDygzR745zilp4= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jiri Slaby , Thomas Gleixner , Brian Gerst , Greg Kroah-Hartman Subject: [PATCH 5.7 208/265] syscalls: Fix offset type of ksys_ftruncate() Date: Mon, 29 Jun 2020 11:17:21 -0400 Message-Id: <20200629151818.2493727-209-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629151818.2493727-1-sashal@kernel.org> References: <20200629151818.2493727-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.7.7-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.7.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.7.7-rc1 X-KernelTest-Deadline: 2020-07-01T15:14+00:00 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: Jiri Slaby commit 8e742aa79780b13cd300a42198c1a4cea9c89905 upstream. After the commit below, truncate() on x86 32bit uses ksys_ftruncate(). But ksys_ftruncate() truncates the offset to unsigned long. Switch the type of offset to loff_t which is what do_sys_ftruncate() expects. Fixes: 121b32a58a3a (x86/entry/32: Use IA32-specific wrappers for syscalls taking 64-bit arguments) Signed-off-by: Jiri Slaby Signed-off-by: Thomas Gleixner Reviewed-by: Brian Gerst Cc: stable@vger.kernel.org Link: https://lkml.kernel.org/r/20200610114851.28549-1-jslaby@suse.cz Signed-off-by: Greg Kroah-Hartman --- include/linux/syscalls.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index 1815065d52f37..1b0c7813197b0 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h @@ -1358,7 +1358,7 @@ static inline long ksys_lchown(const char __user *filename, uid_t user, extern long do_sys_ftruncate(unsigned int fd, loff_t length, int small); -static inline long ksys_ftruncate(unsigned int fd, unsigned long length) +static inline long ksys_ftruncate(unsigned int fd, loff_t length) { return do_sys_ftruncate(fd, length, 1); } -- 2.25.1