diff options
| author | Brian Norris <[email protected]> | 2017-06-01 17:53:55 +0000 |
|---|---|---|
| committer | Brian Norris <[email protected]> | 2017-06-01 17:53:55 +0000 |
| commit | 05e97a9eda72d58dba293857df6aac62584ef99a (patch) | |
| tree | e86e692f26d4879ff2210c54722e2b7780210249 /samples/bpf/cookie_uid_helper_example.c | |
| parent | Linux 4.12-rc1 (diff) | |
| parent | mtd: nand: make nand_ooblayout_lp_hamming_ops static (diff) | |
| download | kernel-05e97a9eda72d58dba293857df6aac62584ef99a.tar.gz kernel-05e97a9eda72d58dba293857df6aac62584ef99a.zip | |
Merge tag 'nand/fixes-for-4.12-rc3' of git://git.infradead.org/linux-mtd into MTD
From Boris:
"""
This pull request contains several fixes to the core and the tango
driver.
tango fixes:
* Add missing MODULE_DEVICE_TABLE() in tango_nand.c
* Update the number of corrected bitflips
core fixes:
* Fix a long standing memory leak in nand_scan_tail()
* Fix several bugs introduced by the per-vendor init/detection
infrastructure (introduced in 4.12)
* Add a static specifier to nand_ooblayout_lp_hamming_ops definition
"""
Diffstat (limited to 'samples/bpf/cookie_uid_helper_example.c')
| -rw-r--r-- | samples/bpf/cookie_uid_helper_example.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/samples/bpf/cookie_uid_helper_example.c b/samples/bpf/cookie_uid_helper_example.c index b08ab4e88929..9d751e209f31 100644 --- a/samples/bpf/cookie_uid_helper_example.c +++ b/samples/bpf/cookie_uid_helper_example.c @@ -306,7 +306,9 @@ int main(int argc, char *argv[]) prog_attach_iptables(argv[2]); if (cfg_test_traffic) { if (signal(SIGINT, finish) == SIG_ERR) - error(1, errno, "register handler failed"); + error(1, errno, "register SIGINT handler failed"); + if (signal(SIGTERM, finish) == SIG_ERR) + error(1, errno, "register SIGTERM handler failed"); while (!test_finish) { print_table(); printf("\n"); |