From nobody Tue Aug 5 00:32:03 2025 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 4bwvWR5nn3z63k0h; Tue, 05 Aug 2025 00:32:03 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bwvWR4rwXz3gmq; Tue, 05 Aug 2025 00:32:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754353923; 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=sE4ovCYhfIoOovGi7NZj1K+eUx4KSuUPAUGIoF6bT6g=; b=QjRciQQexCm7X6ZFqdVf/rtCyHm0dv4apsZwM9MbH7fmuL8lgalqQM9r/Ji1v/2Dh84Hrv GRxXYJRvnNbrsEOwMNLjJ+zAzfULZMuRaJmY+xrQlkSgW7//v3ONCMcOAGVKx7ZkmcZv9k i5k+iUQNS/l7hsJ4xvU6y6+xjCR/muU52EjnJxvMmrI3vKYQu0V80beaP0LfiLC2BdnOKc N45y3Vh0LrEgXKHwg06Yl4fsMtfTHAXANPW7ijYVoFoXPV/5fWRP121CfYr8fuiW/z681c xBO+BpuW1OyFGH3fkyUWq2VENyXvgDwH/v1GouOUU1u+Mktbykj+ckXsCv5kxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754353923; 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=sE4ovCYhfIoOovGi7NZj1K+eUx4KSuUPAUGIoF6bT6g=; b=tYMbCum3QdMgu1fmFYcsXzV4+z7UBHPIDSIIKP84AVRoohyj30SstsVatujv9OVNut1Wel 7W3jme+XbEs1BSzB2qR4Tjw4eGiEKOlQmwmDG22hiHvjd9sUBPUljBGgN0TiqcRDbYiVIU C3OCoK5RW5k3HS/UzWEb4+lP5R2a+A/NW9zkp9r5JLPz/S7YSdaAhCE+5K1gchDzfNbYME ofWtoYii6w+8wc30bL+RhJIyz5GOn5+Ym+yxJAMkVkEV0Im4JnEKVXw64C2IjcnXeocRwR cSj3pUULhj/iqiv9ger4bCQ2n/PJy5FoylO0XJ2fqb57IEfIDAEEiUb0Ni//dg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754353923; a=rsa-sha256; cv=none; b=nPMqOR3IRuQHVRq41HbR/rjAMxXKkW1ovIQWe0CB/TIuVO7TMS3NrtBlsYxsHPgc4GgZVg RlD0t9cZCiqF6xY9065wFWrBytxavp3j+ia+iSI+7tcjTUklAUDerMix1Ff8LASq9rCyjK mRgnSYTID70s2opPd03F04kVlVy3Kix3kGdmpnlqEOJgFJm5Af7FB9Kd1puWdSnKMvu6Zd x4ffdnJuWAh5C6s0HIyDPlGEgUyi1MkJ3uYywpvJy80F3NtbND/SSyk6LY07vw7NfZqYgp TQanT7IB8iQelXc7Ag/OqibKlARSp9M5729LvqABG7xqvSRo0KYOJgeUcUyRVQ== 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 4bwvWR4Qlbz1BS1; Tue, 05 Aug 2025 00:32:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5750W3dF044206; Tue, 5 Aug 2025 00:32:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5750W3or044203; Tue, 5 Aug 2025 00:32:03 GMT (envelope-from git) Date: Tue, 5 Aug 2025 00:32:03 GMT Message-Id: <202508050032.5750W3or044203@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: 4434ecb939f1 - stable/14 - sys_swapon: reject too small devices 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 4434ecb939f17c7a228cb176b690fcca331717b3 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4434ecb939f17c7a228cb176b690fcca331717b3 commit 4434ecb939f17c7a228cb176b690fcca331717b3 Author: Konstantin Belousov AuthorDate: 2025-07-29 16:30:28 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-05 00:30:28 +0000 sys_swapon: reject too small devices (cherry picked from commit aa42e4984997c9d3aa5d30534bdaf760e613e97b) --- sys/vm/swap_pager.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index c23f8bc1f966..ee810ad1c9d5 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -68,7 +68,6 @@ * @(#)vm_swap.c 8.5 (Berkeley) 2/17/94 */ -#include #include "opt_vm.h" #include @@ -2404,7 +2403,7 @@ swapon_check_swzone(void) } } -static void +static int swaponsomething(struct vnode *vp, void *id, u_long nblks, sw_strategy_t *strategy, sw_close_t *close, dev_t dev, int flags) { @@ -2419,6 +2418,8 @@ swaponsomething(struct vnode *vp, void *id, u_long nblks, */ nblks &= ~(ctodb(1) - 1); nblks = dbtoc(nblks); + if (nblks == 0) + return (EINVAL); sp = malloc(sizeof *sp, M_VMPGDATA, M_WAITOK | M_ZERO); sp->sw_blist = blist_create(nblks, M_WAITOK); @@ -2460,6 +2461,8 @@ swaponsomething(struct vnode *vp, void *id, u_long nblks, swp_sizecheck(); mtx_unlock(&sw_dev_mtx); EVENTHANDLER_INVOKE(swapon, sp); + + return (0); } /* @@ -3005,10 +3008,10 @@ swapongeom_locked(struct cdev *dev, struct vnode *vp) return (error); } nblks = pp->mediasize / DEV_BSIZE; - swaponsomething(vp, cp, nblks, swapgeom_strategy, + error = swaponsomething(vp, cp, nblks, swapgeom_strategy, swapgeom_close, dev2udev(dev), (pp->flags & G_PF_ACCEPT_UNMAPPED) != 0 ? SW_UNMAPPED : 0); - return (0); + return (error); } static int @@ -3097,9 +3100,9 @@ swaponvp(struct thread *td, struct vnode *vp, u_long nblks) if (error != 0) return (error); - swaponsomething(vp, vp, nblks, swapdev_strategy, swapdev_close, + error = swaponsomething(vp, vp, nblks, swapdev_strategy, swapdev_close, NODEV, 0); - return (0); + return (error); } static int