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.
Unified · Split
| @@ -221,15 +221,23 @@ typedef struct compat_siginfo { · 220 unmodified lines | ||
| 221 | 221 | #ifdef __ARCH_SI_TRAPNO |
| 222 | 222 | int _trapno; /* TRAP # which caused the signal */ |
| 223 | 223 | #endif |
| 224 | − short int _addr_lsb; /* Valid LSB of the reported address. */ | |
| 225 | 224 | union { |
| 225 | + /* | |
| 226 | + * used when si_code=BUS_MCEERR_AR or | |
| 227 | + * used when si_code=BUS_MCEERR_AO | |
| 228 | + */ | |
| 229 | + short int _addr_lsb; /* Valid LSB of the reported address. */ | |
| 226 | 230 | /* used when si_code=SEGV_BNDERR */ |
| 227 | 231 | struct { |
| 232 | + short _dummy_bnd; | |
| 228 | 233 | compat_uptr_t _lower; |
| 229 | 234 | compat_uptr_t _upper; |
| 230 | 235 | } _addr_bnd; |
| 231 | 236 | /* used when si_code=SEGV_PKUERR */ |
| 232 | − u32 _pkey; | |
| 237 | + struct { | |
| 238 | + short _dummy_pkey; | |
| 239 | + u32 _pkey; | |
| 240 | + } _addr_pkey; | |
| 233 | 241 | }; |
| 234 | 242 | } _sigfault; |
| 235 | 243 | |
| @@ -94,15 +94,23 @@ typedef struct siginfo { · 93 unmodified lines | ||
| 94 | 94 | unsigned int _flags; /* see ia64 si_flags */ |
| 95 | 95 | unsigned long _isr; /* isr */ |
| 96 | 96 | #endif |
| 97 | − short _addr_lsb; /* LSB of the reported address */ | |
| 98 | 97 | union { |
| 98 | + /* | |
| 99 | + * used when si_code=BUS_MCEERR_AR or | |
| 100 | + * used when si_code=BUS_MCEERR_AO | |
| 101 | + */ | |
| 102 | + short _addr_lsb; /* LSB of the reported address */ | |
| 99 | 103 | /* used when si_code=SEGV_BNDERR */ |
| 100 | 104 | struct { |
| 105 | + short _dummy_bnd; | |
| 101 | 106 | void __user *_lower; |
| 102 | 107 | void __user *_upper; |
| 103 | 108 | } _addr_bnd; |
| 104 | 109 | /* used when si_code=SEGV_PKUERR */ |
| 105 | − __u32 _pkey; | |
| 110 | + struct { | |
| 111 | + short _dummy_pkey; | |
| 112 | + __u32 _pkey; | |
| 113 | + } _addr_pkey; | |
| 106 | 114 | }; |
| 107 | 115 | } _sigfault; |
| 108 | 116 | |
| @@ -142,7 +150,7 @@ typedef struct siginfo { · 33 unmodified lines | ||
| 142 | 150 | #define si_addr_lsb _sifields._sigfault._addr_lsb |
| 143 | 151 | #define si_lower _sifields._sigfault._addr_bnd._lower |
| 144 | 152 | #define si_upper _sifields._sigfault._addr_bnd._upper |
| 145 | −#define si_pkey _sifields._sigfault._pkey | |
| 153 | +#define si_pkey _sifields._sigfault._addr_pkey._pkey | |
| 146 | 154 | #define si_band _sifields._sigpoll._band |
| 147 | 155 | #define si_fd _sifields._sigpoll._fd |
| 148 | 156 | #define si_call_addr _sifields._sigsys._call_addr |