Author: arekm                        Date: Mon Jan 17 12:18:12 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix kmalloc() macros

---- Files affected:
packages/kernel:
   kernel-grsec_fixes.patch (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-grsec_fixes.patch
diff -u packages/kernel/kernel-grsec_fixes.patch:1.18 
packages/kernel/kernel-grsec_fixes.patch:1.19
--- packages/kernel/kernel-grsec_fixes.patch:1.18       Mon Jan 17 12:14:23 2011
+++ packages/kernel/kernel-grsec_fixes.patch    Mon Jan 17 13:18:07 2011
@@ -165,3 +165,32 @@
        if (err) {
                sock_release(newsock);
 
+--- linux-2.6.37/include/linux/slab.h~ 2011-01-17 11:48:00.934382737 +0100
++++ linux-2.6.37/include/linux/slab.h  2011-01-17 12:38:01.843508841 +0100
+@@ -344,7 +344,7 @@
+ #define kmalloc(x, y)                                 \
+ ({                                                    \
+       void *___retval;                                \
+-      intoverflow_t ___x = (intoverflow_t)x;          \
++      intoverflow_t ___x = (intoverflow_t)(x);                \
+       if (WARN(___x > ULONG_MAX, "kmalloc size overflow\n"))\
+               ___retval = NULL;                       \
+       else                                            \
+@@ -355,7 +355,7 @@
+ #define kmalloc_node(x, y, z)                                 \
+ ({                                                            \
+       void *___retval;                                        \
+-      intoverflow_t ___x = (intoverflow_t)x;                  \
++      intoverflow_t ___x = (intoverflow_t)(x);                        \
+       if (WARN(___x > ULONG_MAX, "kmalloc_node size overflow\n"))\
+               ___retval = NULL;                               \
+       else                                                    \
+@@ -366,7 +366,7 @@
+ #define kzalloc(x, y)                                 \
+ ({                                                    \
+       void *___retval;                                \
+-      intoverflow_t ___x = (intoverflow_t)x;          \
++      intoverflow_t ___x = (intoverflow_t)(x);                \
+       if (WARN(___x > ULONG_MAX, "kzalloc size overflow\n"))\
+               ___retval = NULL;                       \
+       else                                            \
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-grsec_fixes.patch?r1=1.18&r2=1.19&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to