Module Name: src
Committed By: kamil
Date: Wed Jul 4 02:19:02 UTC 2018
Modified Files:
src/sys/kern: subr_pool.c
Log Message:
Avoid undefined behavior in pr_item_notouch_put()
Do not left shift a signed integer changing its signedness bit.
sys/kern/subr_pool.c:251:30, left shift of 1 by 31 places cannot be represented
in type 'int'
Detected with Kernel Undefined Behavior Sanitizer.
Reported by <Harry Pantazis>
To generate a diff of this commit:
cvs rdiff -u -r1.222 -r1.223 src/sys/kern/subr_pool.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/kern/subr_pool.c
diff -u src/sys/kern/subr_pool.c:1.222 src/sys/kern/subr_pool.c:1.223
--- src/sys/kern/subr_pool.c:1.222 Wed Jul 4 01:42:37 2018
+++ src/sys/kern/subr_pool.c Wed Jul 4 02:19:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_pool.c,v 1.222 2018/07/04 01:42:37 kamil Exp $ */
+/* $NetBSD: subr_pool.c,v 1.223 2018/07/04 02:19:02 kamil Exp $ */
/*-
* Copyright (c) 1997, 1999, 2000, 2002, 2007, 2008, 2010, 2014, 2015
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.222 2018/07/04 01:42:37 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.223 2018/07/04 02:19:02 kamil Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -248,7 +248,7 @@ pr_item_notouch_put(const struct pool *p
{
unsigned int idx = pr_item_notouch_index(pp, ph, obj);
pool_item_bitmap_t *bitmap = ph->ph_bitmap + (idx / BITMAP_SIZE);
- pool_item_bitmap_t mask = 1 << (idx & BITMAP_MASK);
+ pool_item_bitmap_t mask = 1U << (idx & BITMAP_MASK);
KASSERT((*bitmap & mask) == 0);
*bitmap |= mask;
