signal: Move addr_lsb into the _sigfault union for clarity

The addr_lsb fields is only valid and available when the
signal is SIGBUS and the si_code is BUS_MCEERR_AR or BUS_MCEERR_AO.
Document this with a comment and place the field in the _sigfault union
to make this clear.

All of the fields stay in the same physical location so both the old
and new definitions of struct siginfo will continue to work.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>

diff --git a/include/linux/compat.h b/include/linux/compat.h
index 8f8e3ef..e698ec1 100644 (file)
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -221,15 +221,23 @@ typedef struct compat_siginfo {
 #ifdef __ARCH_SI_TRAPNO
                        int _trapno;    /* TRAP # which caused the signal */
 #endif
-                       short int _addr_lsb;    /* Valid LSB of the reported address. */
                        union {
+                               /*
+                                * used when si_code=BUS_MCEERR_AR or
+                                * used when si_code=BUS_MCEERR_AO
+                                */
+                               short int _addr_lsb;    /* Valid LSB of the reported address. */
                                /* used when si_code=SEGV_BNDERR */
                                struct {
+                                       short _dummy_bnd;
                                        compat_uptr_t _lower;
                                        compat_uptr_t _upper;
                                } _addr_bnd;
                                /* used when si_code=SEGV_PKUERR */
-                               u32 _pkey;
+                               struct {
+                                       short _dummy_pkey;
+                                       u32 _pkey;
+                               } _addr_pkey;
                        };
                } _sigfault;
 

diff --git a/include/uapi/asm-generic/siginfo.h b/include/uapi/asm-generic/siginfo.h
index d32f62a..eef4d77 100644 (file)
--- a/include/uapi/asm-generic/siginfo.h
+++ b/include/uapi/asm-generic/siginfo.h
@@ -94,15 +94,23 @@ typedef struct siginfo {
                        unsigned int _flags;    /* see ia64 si_flags */
                        unsigned long _isr;     /* isr */
 #endif
-                       short _addr_lsb; /* LSB of the reported address */
                        union {
+                               /*
+                                * used when si_code=BUS_MCEERR_AR or
+                                * used when si_code=BUS_MCEERR_AO
+                                */
+                               short _addr_lsb; /* LSB of the reported address */
                                /* used when si_code=SEGV_BNDERR */
                                struct {
+                                       short _dummy_bnd;
                                        void __user *_lower;
                                        void __user *_upper;
                                } _addr_bnd;
                                /* used when si_code=SEGV_PKUERR */
-                               __u32 _pkey;
+                               struct {
+                                       short _dummy_pkey;
+                                       __u32 _pkey;
+                               } _addr_pkey;
                        };
                } _sigfault;
 
@@ -142,7 +150,7 @@ typedef struct siginfo {
 #define si_addr_lsb    _sifields._sigfault._addr_lsb
 #define si_lower       _sifields._sigfault._addr_bnd._lower
 #define si_upper       _sifields._sigfault._addr_bnd._upper
-#define si_pkey                _sifields._sigfault._pkey
+#define si_pkey                _sifields._sigfault._addr_pkey._pkey
 #define si_band                _sifields._sigpoll._band
 #define si_fd          _sifields._sigpoll._fd
 #define si_call_addr   _sifields._sigsys._call_addr