Module Name: src
Committed By: riastradh
Date: Wed Jul 24 02:23:48 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/include/linux [riastradh-drm2]: err.h
Log Message:
Avoid INT_MAX in PTR_ERR; check for truncation instead.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 \
src/sys/external/bsd/drm2/include/linux/err.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/err.h
diff -u src/sys/external/bsd/drm2/include/linux/err.h:1.1.2.1 src/sys/external/bsd/drm2/include/linux/err.h:1.1.2.2
--- src/sys/external/bsd/drm2/include/linux/err.h:1.1.2.1 Wed Jul 24 02:07:31 2013
+++ src/sys/external/bsd/drm2/include/linux/err.h Wed Jul 24 02:23:48 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: err.h,v 1.1.2.1 2013/07/24 02:07:31 riastradh Exp $ */
+/* $NetBSD: err.h,v 1.1.2.2 2013/07/24 02:23:48 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@ ERR_PTR(int error)
static inline int
PTR_ERR(const void *ptr)
{
- KASSERT((intptr_t)INT_MAX <= (intptr_t)ptr);
+ KASSERT(ptr == (void *)(intptr_t)(int)(intptr_t)ptr); /* XXX Hurk! */
return (int)(intptr_t)ptr;
}
