Re: [PATCH 06/30] sysinfo: Use explicit types in <linux/sysinfo.h>

From
H. Peter Anvin <hpa@zytor.com>
Date
2012-02-20 17:30:32
Also in
lkml
Reply to
Geert Uytterhoeven, 2012-02-20
Not really... it comes down to "implicit padding in kernel ABI structures is bad".  They can easily become security holes.



Geert Uytterhoeven [off-list ref] wrote:
On Mon, Feb 20, 2012 at 01:07, H. Peter Anvin [off-list ref] wrote:
quoted
--- a/include/linux/sysinfo.h
+++ b/include/linux/sysinfo.h
@@ -1,22 +1,24 @@
 #ifndef _LINUX_SYSINFO_H
 #define _LINUX_SYSINFO_H

+#include <linux/types.h>
+
 #define SI_LOAD_SHIFT  16
 struct sysinfo {
-       long uptime;                    /* Seconds since boot */
-       unsigned long loads[3];         /* 1, 5, and 15 minute load
averages */
quoted
-       unsigned long totalram;         /* Total usable main memory
size */
quoted
-       unsigned long freeram;          /* Available memory size */
-       unsigned long sharedram;        /* Amount of shared memory */
-       unsigned long bufferram;        /* Memory used by buffers */
-       unsigned long totalswap;        /* Total swap space size */
-       unsigned long freeswap;         /* swap space still available
*/
quoted
-       unsigned short procs;           /* Number of current
processes */
quoted
-       unsigned short pad;             /* explicit padding for m68k
*/
quoted
-       unsigned long totalhigh;        /* Total high memory size */
-       unsigned long freehigh;         /* Available high memory size
*/
quoted
-       unsigned int mem_unit;          /* Memory unit size in bytes
*/
quoted
-       char _f[20-2*sizeof(long)-sizeof(int)]; /* Padding: libc5
uses this.. */
quoted
+       __kernel_long_t uptime;         /* Seconds since boot */
+       __kernel_ulong_t loads[3];      /* 1, 5, and 15 minute load
averages */
quoted
+       __kernel_ulong_t totalram;      /* Total usable main memory
size */
quoted
+       __kernel_ulong_t freeram;       /* Available memory size */
+       __kernel_ulong_t sharedram;     /* Amount of shared memory */
+       __kernel_ulong_t bufferram;     /* Memory used by buffers */
+       __kernel_ulong_t totalswap;     /* Total swap space size */
+       __kernel_ulong_t freeswap;      /* swap space still available
*/
quoted
+       __u16 procs;                    /* Number of current
processes */
quoted
+       __u16 pad;                      /* Explicit padding for m68k
*/

Fueling the discussion about natural vs. 4-byte alignment?
quoted
+       __kernel_ulong_t totalhigh;     /* Total high memory size */
+       __kernel_ulong_t freehigh;      /* Available high memory size
*/
quoted
+       __u32 mem_unit;                 /* Memory unit size in bytes
*/
quoted
+       char _f[20-2*sizeof(__kernel_ulong_t)-sizeof(__u32)];   /*
Padding: libc5 uses this.. */
quoted
 };
Gr{oetje,eeting}s,

                       Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 --
geert@linux-m68k.org

In personal conversations with technical people, I call myself a
hacker. But
when I'm talking to journalists I just say "programmer" or something
like that.
                               -- Linus Torvalds
-- 
Sent from my mobile phone. Please excuse my brevity and lack of formatting.
Thread (71 messages) 71 messages, 8 authors, last reply 2012-03-06
Keyboard shortcuts
hback out one level
jnext message in thread / next series-diff position
kprevious message in thread / previous series-diff position
ldrill in
Escclose help / fold thread tree
?toggle this help