Module Name: src
Committed By: martin
Date: Thu Feb 20 19:41:54 UTC 2025
Modified Files:
src/sys/dev [netbsd-10]: dksubr.c
Log Message:
Pull up following revision(s) (requested by jakllsch in ticket #1051):
sys/dev/dksubr.c: revision 1.115
Prevent leakage of 4 bytes of stack data via return of uninitialized b_error.
To generate a diff of this commit:
cvs rdiff -u -r1.113.16.1 -r1.113.16.2 src/sys/dev/dksubr.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/dksubr.c
diff -u src/sys/dev/dksubr.c:1.113.16.1 src/sys/dev/dksubr.c:1.113.16.2
--- src/sys/dev/dksubr.c:1.113.16.1 Fri Sep 20 11:02:23 2024
+++ src/sys/dev/dksubr.c Thu Feb 20 19:41:54 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: dksubr.c,v 1.113.16.1 2024/09/20 11:02:23 martin Exp $ */
+/* $NetBSD: dksubr.c,v 1.113.16.2 2025/02/20 19:41:54 martin Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.113.16.1 2024/09/20 11:02:23 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.113.16.2 2025/02/20 19:41:54 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -522,6 +522,7 @@ dk_discard(struct dk_softc *dksc, dev_t
while (len > 0) {
/* enough data to please the bounds checking code */
+ bp->b_error = 0;
bp->b_dev = dev;
bp->b_blkno = (daddr_t)(pos / secsize);
bp->b_bcount = uimin(len, maxsz);
