diff options
| author |   jsg <jsg@openbsd.org> | 2018-03-05 03:31:39 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2018-03-05 03:31:39 +0000 |
| commit | 0ac5e60d5df6616f38a408497d68b6e63f34ec76 (patch) | |
| tree | 77bd4c540fdae816a32c40bbde3e438cf7e0ff54 /sys/kern/subr_disk.c | |
| parent | Do not redefine PAGE_SHIFT/PAGE_SIZE/PAGE_MASK in vmparam.h; those (diff) | |
| download | wireguard-openbsd-0ac5e60d5df6616f38a408497d68b6e63f34ec76.tar.xz wireguard-openbsd-0ac5e60d5df6616f38a408497d68b6e63f34ec76.zip | |
fix a memory leak in readdoslabel()
ok krw@
Diffstat (limited to 'sys/kern/subr_disk.c')
| -rw-r--r-- | sys/kern/subr_disk.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c index 093c3458c73..f9a8d97cc85 100644 --- a/sys/kern/subr_disk.c +++ b/sys/kern/subr_disk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_disk.c,v 1.232 2017/08/07 11:50:58 kettenis Exp $ */ +/* $OpenBSD: subr_disk.c,v 1.233 2018/03/05 03:31:39 jsg Exp $ */ /* $NetBSD: subr_disk.c,v 1.17 1996/03/16 23:17:08 christos Exp $ */ /* @@ -387,15 +387,12 @@ readdoslabel(struct buf *bp, void (*strat)(struct buf *), if (error == 0) { dospartoff = DL_GETBSTART(gptlp); dospartend = DL_GETBEND(gptlp); - if (partoffp) { - if (dospartoff == 0) - return (ENXIO); - else - goto notfat; - } - *lp = *gptlp; + if (partoffp == 0) + *lp = *gptlp; free(gptlp, M_DEVBUF, sizeof(struct disklabel)); + if (partoffp && dospartoff == 0) + return (ENXIO); goto notfat; } else { free(gptlp, M_DEVBUF, |