History

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

Pull gcc plugins update from Kees Cook: "This finishes the porting work on randstruct, and introduces a new option to structleak, both noted below: - For the randstruct plugin, enable automatic randomization of structures that are entirely function pointers (along with a couple designated initializer fixes). - For the structleak plugin, provide an option to perform zeroing initialization of all otherwise uninitialized stack variables that are passed by reference (Ard Biesheuvel)" * tag 'gcc-plugins-v4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: gcc-plugins: structleak: add option to init all vars used as byref args randstruct: Enable function pointer struct detection drivers/net/wan/z85230.c: Use designated initializers drm/amd/powerplay: rv: Use designated initializers

Linus Torvalds committed 9 years ago

Commit 44ccba32 parents 21d236b ad05e6c6 files · +44 −30Browse files

Unified · Split

6 files
  1. arch/Kconfig +14 −5
  2. drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c +4 −4
  3. drivers/net/wan/z85230.c +14 −16
  4. scripts/Makefile.gcc-plugins +1 −0
  5. scripts/gcc-plugins/randomize_layout_plugin.c +0 −3
  6. scripts/gcc-plugins/structleak_plugin.c +11 −2
arch/Kconfig+14−5
@@ -458,6 +458,13 @@ config GCC_PLUGIN_STRUCTLEAK · 457 unmodified lines
458 * https://grsecurity.net/458 * https://grsecurity.net/
459 * https://pax.grsecurity.net/459 * https://pax.grsecurity.net/
460 460
461config GCC_PLUGIN_STRUCTLEAK_BYREF_ALL
462 bool "Force initialize all struct type variables passed by reference"
463 depends on GCC_PLUGIN_STRUCTLEAK
464 help
465 Zero initialize any struct type local variable that may be passed by
466 reference without having been initialized.
467
461config GCC_PLUGIN_STRUCTLEAK_VERBOSE468config GCC_PLUGIN_STRUCTLEAK_VERBOSE
462 bool "Report forcefully initialized variables"469 bool "Report forcefully initialized variables"
463 depends on GCC_PLUGIN_STRUCTLEAK470 depends on GCC_PLUGIN_STRUCTLEAK
@@ -473,11 +480,13 @@ config GCC_PLUGIN_RANDSTRUCT · 9 unmodified lines
473 depends on GCC_PLUGINS480 depends on GCC_PLUGINS
474 select MODVERSIONS if MODULES481 select MODVERSIONS if MODULES
475 help482 help
476 If you say Y here, the layouts of structures explicitly483 If you say Y here, the layouts of structures that are entirely
477 marked by __randomize_layout will be randomized at484 function pointers (and have not been manually annotated with
478 compile-time. This can introduce the requirement of an485 __no_randomize_layout), or structures that have been explicitly
479 additional information exposure vulnerability for exploits486 marked with __randomize_layout, will be randomized at compile-time.
480 targeting these structure types.487 This can introduce the requirement of an additional information
488 exposure vulnerability for exploits targeting these structure
489 types.
481 490
482 Enabling this feature will introduce some performance impact,491 Enabling this feature will introduce some performance impact,
483 slightly increase memory usage, and prevent the use of forensic492 slightly increase memory usage, and prevent the use of forensic
drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c+4−4
@@ -317,8 +317,8 @@ static int rv_tf_set_num_active_display(struct pp_hwmgr *hwmgr, void *input, · 316 unmodified lines
317}317}
318 318
319static const struct phm_master_table_item rv_set_power_state_list[] = {319static const struct phm_master_table_item rv_set_power_state_list[] = {
320 { NULL, rv_tf_set_clock_limit },320 { .tableFunction = rv_tf_set_clock_limit },
321 { NULL, rv_tf_set_num_active_display },321 { .tableFunction = rv_tf_set_num_active_display },
322 { }322 { }
323};323};
324 324
@@ -391,7 +391,7 @@ static int rv_tf_disable_gfx_off(struct pp_hwmgr *hwmgr, · 66 unmodified lines
391}391}
392 392
393static const struct phm_master_table_item rv_disable_dpm_list[] = {393static const struct phm_master_table_item rv_disable_dpm_list[] = {
394 {NULL, rv_tf_disable_gfx_off},394 { .tableFunction = rv_tf_disable_gfx_off },
395 { },395 { },
396};396};
397 397
@@ -416,7 +416,7 @@ static int rv_tf_enable_gfx_off(struct pp_hwmgr *hwmgr, · 18 unmodified lines
416}416}
417 417
418static const struct phm_master_table_item rv_enable_dpm_list[] = {418static const struct phm_master_table_item rv_enable_dpm_list[] = {
419 {NULL, rv_tf_enable_gfx_off},419 { .tableFunction = rv_tf_enable_gfx_off },
420 { },420 { },
421};421};
422 422
drivers/net/wan/z85230.c+14−16
@@ -483,11 +483,10 @@ static void z8530_status(struct z8530_channel *chan) · 482 unmodified lines
483 write_zsctrl(chan, RES_H_IUS);483 write_zsctrl(chan, RES_H_IUS);
484}484}
485 485
486struct z8530_irqhandler z8530_sync =486struct z8530_irqhandler z8530_sync = {
487{487 .rx = z8530_rx,
488 z8530_rx,488 .tx = z8530_tx,
489 z8530_tx,489 .status = z8530_status,
490 z8530_status
491};490};
492 491
493EXPORT_SYMBOL(z8530_sync);492EXPORT_SYMBOL(z8530_sync);
@@ -605,15 +604,15 @@ static void z8530_dma_status(struct z8530_channel *chan) · 111 unmodified lines
605}604}
606 605
607static struct z8530_irqhandler z8530_dma_sync = {606static struct z8530_irqhandler z8530_dma_sync = {
608 z8530_dma_rx,607 .rx = z8530_dma_rx,
609 z8530_dma_tx,608 .tx = z8530_dma_tx,
610 z8530_dma_status609 .status = z8530_dma_status,
611};610};
612 611
613static struct z8530_irqhandler z8530_txdma_sync = {612static struct z8530_irqhandler z8530_txdma_sync = {
614 z8530_rx,613 .rx = z8530_rx,
615 z8530_dma_tx,614 .tx = z8530_dma_tx,
616 z8530_dma_status615 .status = z8530_dma_status,
617};616};
618 617
619/**618/**
@@ -678,11 +677,10 @@ static void z8530_status_clear(struct z8530_channel *chan) · 58 unmodified lines
678 write_zsctrl(chan, RES_H_IUS);677 write_zsctrl(chan, RES_H_IUS);
679}678}
680 679
681struct z8530_irqhandler z8530_nop=680struct z8530_irqhandler z8530_nop = {
682{681 .rx = z8530_rx_clear,
683 z8530_rx_clear,682 .tx = z8530_tx_clear,
684 z8530_tx_clear,683 .status = z8530_status_clear,
685 z8530_status_clear
686};684};
687 685
688 686
scripts/Makefile.gcc-plugins+1−0
@@ -27,6 +27,7 @@ ifdef CONFIG_GCC_PLUGINS · 26 unmodified lines
27 27
28 gcc-plugin-$(CONFIG_GCC_PLUGIN_STRUCTLEAK) += structleak_plugin.so28 gcc-plugin-$(CONFIG_GCC_PLUGIN_STRUCTLEAK) += structleak_plugin.so
29 gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE) += -fplugin-arg-structleak_plugin-verbose29 gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE) += -fplugin-arg-structleak_plugin-verbose
30 gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL) += -fplugin-arg-structleak_plugin-byref-all
30 gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK) += -DSTRUCTLEAK_PLUGIN31 gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK) += -DSTRUCTLEAK_PLUGIN
31 32
32 gcc-plugin-$(CONFIG_GCC_PLUGIN_RANDSTRUCT) += randomize_layout_plugin.so33 gcc-plugin-$(CONFIG_GCC_PLUGIN_RANDSTRUCT) += randomize_layout_plugin.so
scripts/gcc-plugins/randomize_layout_plugin.c+0−3
@@ -436,9 +436,6 @@ static int is_pure_ops_struct(const_tree node) · 435 unmodified lines
436 436
437 gcc_assert(TREE_CODE(node) == RECORD_TYPE || TREE_CODE(node) == UNION_TYPE);437 gcc_assert(TREE_CODE(node) == RECORD_TYPE || TREE_CODE(node) == UNION_TYPE);
438 438
439 /* XXX: Do not apply randomization to all-ftpr structs yet. */
440 return 0;
441
442 for (field = TYPE_FIELDS(node); field; field = TREE_CHAIN(field)) {439 for (field = TYPE_FIELDS(node); field; field = TREE_CHAIN(field)) {
443 const_tree fieldtype = get_field_type(field);440 const_tree fieldtype = get_field_type(field);
444 enum tree_code code = TREE_CODE(fieldtype);441 enum tree_code code = TREE_CODE(fieldtype);
scripts/gcc-plugins/structleak_plugin.c+11−2
@@ -16,6 +16,7 @@ · 15 unmodified lines
16 * Options:16 * Options:
17 * -fplugin-arg-structleak_plugin-disable17 * -fplugin-arg-structleak_plugin-disable
18 * -fplugin-arg-structleak_plugin-verbose18 * -fplugin-arg-structleak_plugin-verbose
19 * -fplugin-arg-structleak_plugin-byref-all
19 *20 *
20 * Usage:21 * Usage:
21 * $ # for 4.5/4.6/C based 4.722 * $ # for 4.5/4.6/C based 4.7
@@ -42,6 +43,7 @@ static struct plugin_info structleak_plugin_info = { · 20 unmodified lines
42};43};
43 44
44static bool verbose;45static bool verbose;
46static bool byref_all;
45 47
46static tree handle_user_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)48static tree handle_user_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
47{49{
@@ -150,7 +152,9 @@ static void initialize(tree var) · 102 unmodified lines
150 /* these aren't the 0days you're looking for */152 /* these aren't the 0days you're looking for */
151 if (verbose)153 if (verbose)
152 inform(DECL_SOURCE_LOCATION(var),154 inform(DECL_SOURCE_LOCATION(var),
153 "userspace variable will be forcibly initialized");155 "%s variable will be forcibly initialized",
156 (byref_all && TREE_ADDRESSABLE(var)) ? "byref"
157 : "userspace");
154 158
155 /* build the initializer expression */159 /* build the initializer expression */
156 initializer = build_constructor(TREE_TYPE(var), NULL);160 initializer = build_constructor(TREE_TYPE(var), NULL);
@@ -190,7 +194,8 @@ static unsigned int structleak_execute(void) · 33 unmodified lines
190 continue;194 continue;
191 195
192 /* if the type is of interest, examine the variable */196 /* if the type is of interest, examine the variable */
193 if (TYPE_USERSPACE(type))197 if (TYPE_USERSPACE(type) ||
198 (byref_all && TREE_ADDRESSABLE(var)))
194 initialize(var);199 initialize(var);
195 }200 }
196 201
@@ -232,6 +237,10 @@ __visible int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gc · 35 unmodified lines
232 verbose = true;237 verbose = true;
233 continue;238 continue;
234 }239 }
240 if (!strcmp(argv[i].key, "byref-all")) {
241 byref_all = true;
242 continue;
243 }
235 error(G_("unknown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);244 error(G_("unknown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
236 }245 }
237 246

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