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=-16.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,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 1277AC432BE for ; Mon, 26 Jul 2021 14:12:05 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id C306760F9B for ; Mon, 26 Jul 2021 14:12:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org C306760F9B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 817938E0006; Mon, 26 Jul 2021 10:12:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 779AE8E0001; Mon, 26 Jul 2021 10:12:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 640D68E0006; Mon, 26 Jul 2021 10:12:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0172.hostedemail.com [216.40.44.172]) by kanga.kvack.org (Postfix) with ESMTP id 488D18E0001 for ; Mon, 26 Jul 2021 10:12:02 -0400 (EDT) Received: from smtpin05.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id F20AA1828F68E for ; Mon, 26 Jul 2021 14:12:01 +0000 (UTC) X-FDA: 78404928042.05.5AB9E17 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf25.hostedemail.com (Postfix) with ESMTP id 9F2C9B00018D for ; Mon, 26 Jul 2021 14:12:01 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 6CEF360560; Mon, 26 Jul 2021 14:11:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1627308721; bh=k/+0BZVT585d7LUcyfp2e8qjSIzc/iRFeep7rM6abm8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BDqgP1ODlxzPWY/5clREbQWr4CDGiw84LHLWwYuRndOlHCJ/eg631+MMGzxold+li smxh4VUWITzTdBiGdQiDlZR5LCSNQ6H4FaM9oJmwiVDEsbPyVk4g8tUs4zxQEBVygd jbHQLoX8ouYmFOPkJvdTojD5fnxq0ceq/zZBoufSV9SYflQKMNCv02pPa7z8A2x09g P6fGt7mcplSy8Ra7HoJ14AQtA4ApJ3AHtliHyFFY9x/y78xpfSRIkm4rI0XfdCoStu YsQ4VICijEoSlCbntQOktrM7x+Z7BVzhkgP91FOv4ZZwGvEuM43Eit+LlfuZ07YUBW dwrgNm44IQOwg== From: Arnd Bergmann To: Russell King Cc: Arnd Bergmann , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, Alexander Viro , Linus Walleij Subject: [PATCH v5 07/10] ARM: oabi-compat: rework fcntl64() emulation Date: Mon, 26 Jul 2021 16:11:38 +0200 Message-Id: <20210726141141.2839385-8-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210726141141.2839385-1-arnd@kernel.org> References: <20210726141141.2839385-1-arnd@kernel.org> MIME-Version: 1.0 Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=BDqgP1OD; spf=pass (imf25.hostedemail.com: domain of arnd@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=arnd@kernel.org; dmarc=pass (policy=none) header.from=kernel.org X-Rspamd-Server: rspam02 X-Stat-Signature: yuhorifnxxfz1xx76tw3swz7xz5ftmg4 X-Rspamd-Queue-Id: 9F2C9B00018D X-HE-Tag: 1627308721-802657 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Arnd Bergmann This is one of the last users of get_fs(), and this is fairly easy to change, since the infrastructure for it is already there. The replacement here is essentially a copy of the existing fcntl64() syscall entry function. Signed-off-by: Arnd Bergmann --- arch/arm/kernel/sys_oabi-compat.c | 93 ++++++++++++++++++++----------- 1 file changed, 60 insertions(+), 33 deletions(-) diff --git a/arch/arm/kernel/sys_oabi-compat.c b/arch/arm/kernel/sys_oabi= -compat.c index 5ea365c35ca5..223ee46b6e75 100644 --- a/arch/arm/kernel/sys_oabi-compat.c +++ b/arch/arm/kernel/sys_oabi-compat.c @@ -194,56 +194,83 @@ struct oabi_flock64 { pid_t l_pid; } __attribute__ ((packed,aligned(4))); =20 -static long do_locks(unsigned int fd, unsigned int cmd, - unsigned long arg) +static int get_oabi_flock(struct flock64 *kernel, struct oabi_flock64 __= user *arg) { - struct flock64 kernel; struct oabi_flock64 user; - mm_segment_t fs; - long ret; =20 if (copy_from_user(&user, (struct oabi_flock64 __user *)arg, sizeof(user))) return -EFAULT; - kernel.l_type =3D user.l_type; - kernel.l_whence =3D user.l_whence; - kernel.l_start =3D user.l_start; - kernel.l_len =3D user.l_len; - kernel.l_pid =3D user.l_pid; - - fs =3D get_fs(); - set_fs(KERNEL_DS); - ret =3D sys_fcntl64(fd, cmd, (unsigned long)&kernel); - set_fs(fs); - - if (!ret && (cmd =3D=3D F_GETLK64 || cmd =3D=3D F_OFD_GETLK)) { - user.l_type =3D kernel.l_type; - user.l_whence =3D kernel.l_whence; - user.l_start =3D kernel.l_start; - user.l_len =3D kernel.l_len; - user.l_pid =3D kernel.l_pid; - if (copy_to_user((struct oabi_flock64 __user *)arg, - &user, sizeof(user))) - ret =3D -EFAULT; - } - return ret; + + kernel->l_type =3D user.l_type; + kernel->l_whence =3D user.l_whence; + kernel->l_start =3D user.l_start; + kernel->l_len =3D user.l_len; + kernel->l_pid =3D user.l_pid; + + return 0; +} + +static int put_oabi_flock(struct flock64 *kernel, struct oabi_flock64 __= user *arg) +{ + struct oabi_flock64 user; + + user.l_type =3D kernel->l_type; + user.l_whence =3D kernel->l_whence; + user.l_start =3D kernel->l_start; + user.l_len =3D kernel->l_len; + user.l_pid =3D kernel->l_pid; + + if (copy_to_user((struct oabi_flock64 __user *)arg, + &user, sizeof(user))) + return -EFAULT; + + return 0; } =20 asmlinkage long sys_oabi_fcntl64(unsigned int fd, unsigned int cmd, unsigned long arg) { + void __user *argp =3D (void __user *)arg; + struct fd f =3D fdget_raw(fd); + struct flock64 flock; + long err =3D -EBADF; + + if (!f.file) + goto out; + switch (cmd) { - case F_OFD_GETLK: - case F_OFD_SETLK: - case F_OFD_SETLKW: case F_GETLK64: + case F_OFD_GETLK: + err =3D security_file_fcntl(f.file, cmd, arg); + if (err) + break; + err =3D get_oabi_flock(&flock, argp); + if (err) + break; + err =3D fcntl_getlk64(f.file, cmd, &flock); + if (!err) + err =3D put_oabi_flock(&flock, argp); + break; case F_SETLK64: case F_SETLKW64: - return do_locks(fd, cmd, arg); - + case F_OFD_SETLK: + case F_OFD_SETLKW: + err =3D security_file_fcntl(f.file, cmd, arg); + if (err) + break; + err =3D get_oabi_flock(&flock, argp); + if (err) + break; + err =3D fcntl_setlk64(fd, f.file, cmd, &flock); + break; default: - return sys_fcntl64(fd, cmd, arg); + err =3D sys_fcntl64(fd, cmd, arg); + break; } + fdput(f); +out: + return err; } =20 struct oabi_epoll_event { --=20 2.29.2