diff options
| author |   aoyama <aoyama@openbsd.org> | 2017-01-09 08:46:13 +0000 |
|---|---|---|
| committer | aoyama <aoyama@openbsd.org> | 2017-01-09 08:46:13 +0000 |
| commit | 12f91a820290c6bde3ae2f3ee334b17c1544483b (patch) | |
| tree | d8528e0e9407046850c8fa1a0c4f052a18cd2a0f | |
| parent | i386 vmm requires PAE mode to be in use. don't match vmm(4) if ! PAE. (diff) | |
| download | wireguard-openbsd-12f91a820290c6bde3ae2f3ee334b17c1544483b.tar.xz wireguard-openbsd-12f91a820290c6bde3ae2f3ee334b17c1544483b.zip | |
Sync with NetBSD/luna68k changes.
>> Fix (mostly harmless) off-by-one size check in XPIOCDOWNLD ioctl.
>> Consistently use sc_shm_size initialized at device attach.
http://mail-index.netbsd.org/source-changes/2017/01/08/msg080666.html
http://mail-index.netbsd.org/source-changes/2017/01/08/msg080667.html
| -rw-r--r-- | sys/arch/luna88k/dev/xp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/luna88k/dev/xp.c b/sys/arch/luna88k/dev/xp.c index 10957e531f3..bf801267ce4 100644 --- a/sys/arch/luna88k/dev/xp.c +++ b/sys/arch/luna88k/dev/xp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xp.c,v 1.1 2016/12/17 05:22:34 aoyama Exp $ */ +/* $OpenBSD: xp.c,v 1.2 2017/01/09 08:46:13 aoyama Exp $ */ /* $NetBSD: xp.c,v 1.1 2016/12/03 17:38:02 tsutsui Exp $ */ /*- @@ -205,7 +205,7 @@ xpioctl(dev_t dev, u_long cmd, void *addr, int flags, struct proc *p) case XPIOCDOWNLD: downld = addr; loadsize = downld->size; - if (loadsize == 0 || loadsize >= XP_SHM_SIZE) { + if (loadsize == 0 || loadsize > sc->sc_shm_size) { return EINVAL; } |