Module Name: src
Committed By: riastradh
Date: Mon Dec 30 04:51:24 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/include/linux [riastradh-drm2]: slab.h
Log Message:
Avoid dividing by zero when allocating empty array in kcalloc.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.8 -r1.1.2.9 \
src/sys/external/bsd/drm2/include/linux/slab.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/include/linux/slab.h
diff -u src/sys/external/bsd/drm2/include/linux/slab.h:1.1.2.8 src/sys/external/bsd/drm2/include/linux/slab.h:1.1.2.9
--- src/sys/external/bsd/drm2/include/linux/slab.h:1.1.2.8 Wed Jul 24 04:01:51 2013
+++ src/sys/external/bsd/drm2/include/linux/slab.h Mon Dec 30 04:51:24 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: slab.h,v 1.1.2.8 2013/07/24 04:01:51 riastradh Exp $ */
+/* $NetBSD: slab.h,v 1.1.2.9 2013/12/30 04:51:24 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -76,7 +76,8 @@ kzalloc(size_t size, gfp_t gfp)
static inline void *
kcalloc(size_t n, size_t size, gfp_t gfp)
{
- KASSERT(size <= (SIZE_MAX / n));
+ KASSERT(size != 0);
+ KASSERT(n <= (SIZE_MAX / size));
return malloc((n * size), M_TEMP, (linux_gfp_to_malloc(gfp) | M_ZERO));
}
