Merge branch 'siginfo-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

Pull sigingo fix from Eric Biederman: "The kbuild test robot found that I accidentally moved si_pkey when I was cleaning up siginfo_t. A short followed by an int with the int having 8 byte alignment. Sheesh siginfo_t is a weird structure. I have now corrected it and added build time checks that with a little luck will catch any similar future mistakes. The build time checks were sufficient for me to verify the bug and to verify my fix. So they are at least useful this once." * 'siginfo-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: signal/x86: Include the field offsets in the build time checks signal: Correct the offset of si_pkey in struct siginfo

Linus Torvalds committed 8 years ago

Commit 86f84772 parents ce38061 f6a01543 files · +69 −4Browse files

Showing the changes to include/uapi (1 of 3 files). Show all

Unified · Split

include/uapi/asm-generic/siginfo.h+2−2

@@ -102,13 +102,13 @@ typedef struct siginfo { · 101 unmodified lines
102	short _addr_lsb; /* LSB of the reported address */	102	short _addr_lsb; /* LSB of the reported address */
103	/* used when si_code=SEGV_BNDERR */	103	/* used when si_code=SEGV_BNDERR */
104	struct {	104	struct {
105	short _dummy_bnd;	105	void *_dummy_bnd;
106	void __user *_lower;	106	void __user *_lower;
107	void __user *_upper;	107	void __user *_upper;
108	} _addr_bnd;	108	} _addr_bnd;
109	/* used when si_code=SEGV_PKUERR */	109	/* used when si_code=SEGV_PKUERR */
110	struct {	110	struct {
111	short _dummy_pkey;	111	void *_dummy_pkey;
112	__u32 _pkey;	112	__u32 _pkey;
113	} _addr_pkey;	113	} _addr_pkey;
114	};	114	};