History

Merge tag 'gcc-plugins-v4.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

Pull structure randomization updates from Kees Cook: "Now that IPC and other changes have landed, enable manual markings for randstruct plugin, including the task_struct. This is the rest of what was staged in -next for the gcc-plugins, and comes in three patches, largest first: - mark "easy" structs with __randomize_layout - mark task_struct with an optional anonymous struct to isolate the __randomize_layout section - mark structs to opt _out_ of automated marking (which will come later) And, FWIW, this continues to pass allmodconfig (normal and patched to enable gcc-plugins) builds of x86_64, i386, arm64, arm, powerpc, and s390 for me" * tag 'gcc-plugins-v4.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: randstruct: opt-out externally exposed function pointer structs task_struct: Allow randomized layout randstruct: Mark various structs for randomization

Linus Torvalds committed 9 years ago

Commit e06fdaf2 parents a90c6ac 8acdf5042 files · +97 −66Browse files

Showing the changes to kernel (1 of 42 files). Show all

Unified · Split

kernel/futex.c+2−2
@@ -212,7 +212,7 @@ struct futex_pi_state { · 211 unmodified lines
212 atomic_t refcount;212 atomic_t refcount;
213 213
214 union futex_key key;214 union futex_key key;
215};215} __randomize_layout;
216 216
217/**217/**
218 * struct futex_q - The hashed futex queue entry, one per waiting task218 * struct futex_q - The hashed futex queue entry, one per waiting task
@@ -246,7 +246,7 @@ struct futex_q { · 27 unmodified lines
246 struct rt_mutex_waiter *rt_waiter;246 struct rt_mutex_waiter *rt_waiter;
247 union futex_key *requeue_pi_key;247 union futex_key *requeue_pi_key;
248 u32 bitset;248 u32 bitset;
249};249} __randomize_layout;
250 250
251static const struct futex_q futex_q_init = {251static const struct futex_q futex_q_init = {
252 /* list gets initialized in queue_me()*/252 /* list gets initialized in queue_me()*/

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t