Module Name: src Committed By: riastradh Date: Sat Apr 29 06:23:37 UTC 2023
Modified Files: src/sys/dev/dkwedge: dk.c Log Message: dk(4): Fix lock assertion in size increase: parent's, not wedge's. Reported-by: syzbot+d4dc610473cacc518...@syzkaller.appspotmail.com https://syzkaller.appspot.com/bug?id=e18ddae8283d6fab44cfb1ac7e3f8e791f8c0700 To generate a diff of this commit: cvs rdiff -u -r1.150 -r1.151 src/sys/dev/dkwedge/dk.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/dkwedge/dk.c diff -u src/sys/dev/dkwedge/dk.c:1.150 src/sys/dev/dkwedge/dk.c:1.151 --- src/sys/dev/dkwedge/dk.c:1.150 Sat Apr 22 13:11:50 2023 +++ src/sys/dev/dkwedge/dk.c Sat Apr 29 06:23:37 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: dk.c,v 1.150 2023/04/22 13:11:50 riastradh Exp $ */ +/* $NetBSD: dk.c,v 1.151 2023/04/29 06:23:37 riastradh Exp $ */ /*- * Copyright (c) 2004, 2005, 2006, 2007 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.150 2023/04/22 13:11:50 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.151 2023/04/29 06:23:37 riastradh Exp $"); #ifdef _KERNEL_OPT #include "opt_dkwedge.h" @@ -333,7 +333,7 @@ static void dkwedge_size_increase(struct dkwedge_softc *sc, uint64_t size) { - KASSERT(mutex_owned(&sc->sc_dk.dk_openlock)); + KASSERT(mutex_owned(&sc->sc_parent->dk_openlock)); rw_enter(&sc->sc_sizelock, RW_WRITER); KASSERTMSG(size >= sc->sc_size,