From nobody Mon Dec 20 00:38:06 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 7ACA618F0637; Mon, 20 Dec 2021 00:38:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JHLKV1cxfz3rNY; Mon, 20 Dec 2021 00:38:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 18142482D; Mon, 20 Dec 2021 00:38:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BK0c6V7059852; Mon, 20 Dec 2021 00:38:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BK0c6GZ059851; Mon, 20 Dec 2021 00:38:06 GMT (envelope-from git) Date: Mon, 20 Dec 2021 00:38:06 GMT Message-Id: <202112200038.1BK0c6GZ059851@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 6ceede7d3669 - stable/13 - swapoff(2): replace special device name argument with a structure List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6ceede7d36691d3daa736e73fe6a0b52479bfeb2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639960686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gz0Aybni7GN6+evW2REm6bM7uHpbxqCU2DYwRt7Y5VQ=; b=BN5hJGjcMnfBdEpwqAPgp/qmbXCfanxtQoMTZ2bq0OiRkQCkP3qGHjO8CVt8BH8pG7ESMg n3Lhrh3OLretCnSTJr+VMQI22nuWf/8lZ2/sxnSeMaoTn3EyA6PLC5CrBvHcdHq9fOj6fa jnyr1KMcyECN/9bbADOI5njJ/4BIY7i/zwpKJf3uvomsw71xzVhLgwjtNel8GIJiscbYeF b31YjLMwoFXY1+ZEia7d/IQ+zREKVU+A9oezFigKoPiZqcHXbP5E8Br0UyLnXM5zx2rBFA Xwkedsfa/78bYHoHgpUnTG3cGCuib1RVMD4wY5HIJy1iScxgjlDyCf6+/a5IvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639960686; a=rsa-sha256; cv=none; b=sXiBflnqVncogfvqGHqL7LTgNE5DD5scpe+i//REH5t2f01EyFoAuuimPEWauHWnVsQXWj xNseSpEAw7sOVl1B2K4GIml6c47QYlyMJBYcZgpE9E6ey81E6B9W7D3O14yyxTbfjr+g44 YPB+r/SgpnIZEhEAOUNefL1qBxhi8pi8ZKR+Tg9seYfZfQiVDLmgu2EzsYT8t10nNDwfqI GiLtVyBq/Q4QlG2FF3vGtAw8aAghvkJYuLP0D02z/lhN/k011yPykCyc7EYoDKJgvAa9TI 54kP5UvsjTyGuNc3wMPo/iipnsBi13HGoa+wfCt6aFrrabHmYsWAGgKxBppesg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6ceede7d36691d3daa736e73fe6a0b52479bfeb2 commit 6ceede7d36691d3daa736e73fe6a0b52479bfeb2 Author: Konstantin Belousov AuthorDate: 2021-11-29 16:26:31 +0000 Commit: Konstantin Belousov CommitDate: 2021-12-20 00:29:11 +0000 swapoff(2): replace special device name argument with a structure (cherry picked from commit a4e4132fa3bfadb6047fc0fa5f399f4640460300) --- sys/vm/swap_pager.c | 27 +++++++++++++++++++++++++-- sys/vm/swap_pager.h | 8 ++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 3893199e30b5..17722f314650 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -2485,15 +2485,38 @@ sys_swapoff(struct thread *td, struct swapoff_args *uap) struct vnode *vp; struct nameidata nd; struct swdevt *sp; - int error; + struct swapoff_new_args sa; + int error, probe_byte; error = priv_check(td, PRIV_SWAPOFF); if (error) return (error); + /* + * Detect old vs. new-style swapoff(2) syscall. The first + * pointer in the memory pointed to by uap->name is NULL for + * the new variant. + */ + probe_byte = fubyte(uap->name); + switch (probe_byte) { + case -1: + return (EFAULT); + case 0: + error = copyin(uap->name, &sa, sizeof(sa)); + if (error != 0) + return (error); + if (sa.flags != 0) + return (EINVAL); + break; + default: + bzero(&sa, sizeof(sa)); + sa.name = uap->name; + break; + } + sx_xlock(&swdev_syscall_lock); - NDINIT(&nd, LOOKUP, FOLLOW | AUDITVNODE1, UIO_USERSPACE, uap->name, + NDINIT(&nd, LOOKUP, FOLLOW | AUDITVNODE1, UIO_USERSPACE, sa.name, td); error = namei(&nd); if (error) diff --git a/sys/vm/swap_pager.h b/sys/vm/swap_pager.h index 6761d4f99ee4..ed0abdee7d3f 100644 --- a/sys/vm/swap_pager.h +++ b/sys/vm/swap_pager.h @@ -68,6 +68,14 @@ struct swdevt { #define SW_UNMAPPED 0x01 #define SW_CLOSING 0x04 +struct swapoff_new_args { + const char *name_old_syscall; + const char *name; + u_int flags; + u_int pad0; + uintptr_t pad1[8]; +}; + #ifdef _KERNEL extern int swap_pager_avail;