selinux build failure

Fixes the problem on 64 bit s390. I still get a __you_cannot_kmalloc_that_much link error in avtab_init() and some more warnings about selinux:

security/selinux/hooks.c: In function `selinux_bprm_set_security':
security/selinux/hooks.c:1384: warning: cast to pointer from integer of different size security/selinux/hooks.c:1430: warning: cast to pointer from integer of different size security/selinux/hooks.c: In function `selinux_bprm_compute_creds':
security/selinux/hooks.c:1520: warning: cast from pointer to integer of different size security/selinux/hooks.c: In function `selinux_getprocattr':
security/selinux/hooks.c:3147: warning: passing arg 3 of security_sid_to_context' from incompatible pointer type security/selinux/ss/ebitmap.c: In function ebitmap_read':
security/selinux/ss/ebitmap.c:255: warning: int format, different type arg (arg 3) security/selinux/ss/ebitmap.c:264: warning: int format, different type arg (arg 3) security/selinux/ss/ebitmap.c:287: warning: int format, different type arg (arg 3) security/selinux/ss/ebitmap.c:293: warning: int format, different type arg (arg 3) security/selinux/ss/policydb.c: In function `policydb_read':
security/selinux/ss/policydb.c:1078: warning: int format, different type arg (arg 3)

The link error can be avoided by using vmalloc for htable, but there may be better solutions.

===== security/selinux/ss/avtab.c 1.1 vs edited =====

@@ -106,7 +106,7 @@
                }
                h->htable[i] = NULL;
        }
-       kfree(h->htable);
+       vfree(h->htable);
 }
 
 

@@ -138,7 +138,7 @@
 {
        int i;
 
-       h->htable = kmalloc(sizeof(*(h->htable)) * AVTAB_SIZE, GFP_KERNEL);
+       h->htable = vmalloc(sizeof(*(h->htable)) * AVTAB_SIZE);
        if (!h->htable)
                return -ENOMEM;
        for (i = 0; i < AVTAB_SIZE; i++)

===== security/selinux/ss/global.h 1.2 vs edited =====

@@ -8,6 +8,7 @@
 #include <linux/in.h>
 #include <linux/spinlock.h>
 #include <linux/sched.h>
+#include <linux/vmalloc.h>
 
 #include "flask.h"
 #include "avc.h"

On Sun, 24 Aug 2003 02:21:08 +0200 Arnd Bergmann <[email protected]> wrote:

| James Morris wrote:
| 
| > On Sun, 24 Aug 2003, Christoph Hellwig wrote:
| > 
| >> Argg, this is b0rked.  {asm,linux}/compat.h are for the 32bit compatiblity
| >> code.  64bit arches don't have fcntl64 - see the #if BITS_PER_LONG == 32
| >> around sys_fcntl64 in fcntl.c..
| > 
| > Indeed.  How about this?

Yes, the second patch fixes for me also. [2.6.0-test4 now] I also see the warnings below.

| security/selinux/hooks.c: In function `selinux_bprm_set_security':
| security/selinux/hooks.c:1384: warning: cast to pointer from integer of different size
| security/selinux/hooks.c:1430: warning: cast to pointer from integer of different size
| security/selinux/hooks.c: In function `selinux_bprm_compute_creds':
| security/selinux/hooks.c:1520: warning: cast from pointer to integer of different size
| security/selinux/hooks.c: In function `selinux_getprocattr':
| security/selinux/hooks.c:3147: warning: passing arg 3 of `security_sid_to_context' from incompatible pointer type

Thanks.
--
~Randy [mantra: Always include kernel version.]
"Everything is relative."

Yep, a fix for this is forthcoming.

- James

James Morris
<[email protected]>