git: 4434ecb939f1 - stable/14 - sys_swapon: reject too small devices

[Konstantin Belousov]

The branch stable/14 has been updated by kib:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=4434ecb939f17c7a228cb176b690fcca331717b3

commit 4434ecb939f17c7a228cb176b690fcca331717b3
Author:     Konstantin Belousov <k...@freebsd.org>
AuthorDate: 2025-07-29 16:30:28 +0000
Commit:     Konstantin Belousov <k...@freebsd.org>
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 <sys/cdefs.h>
 #include "opt_vm.h"
 
 #include <sys/param.h>
@@ -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