From: Greg Kroah-Hartman Date: Wed, 9 Nov 2016 08:35:58 +0000 (+0100) Subject: 4.8-stable patches X-Git-Tag: v4.4.31~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4283845369a0fc4f2389df7671d842272d2da5c5;p=thirdparty%2Fkernel%2Fstable-queue.git 4.8-stable patches added patches: i2c-mark-device-nodes-only-in-case-of-successful-instantiation.patch netfilter-xt_nflog-fix-unexpected-truncated-packet.patch --- diff --git a/queue-4.8/i2c-mark-device-nodes-only-in-case-of-successful-instantiation.patch b/queue-4.8/i2c-mark-device-nodes-only-in-case-of-successful-instantiation.patch new file mode 100644 index 00000000000..88e29b05b00 --- /dev/null +++ b/queue-4.8/i2c-mark-device-nodes-only-in-case-of-successful-instantiation.patch @@ -0,0 +1,68 @@ +From 6a676fb69dcbf3310b9e462c1db66c8e7f6ead38 Mon Sep 17 00:00:00 2001 +From: Ralf Ramsauer +Date: Mon, 17 Oct 2016 15:59:57 +0200 +Subject: i2c: mark device nodes only in case of successful instantiation + +From: Ralf Ramsauer + +commit 6a676fb69dcbf3310b9e462c1db66c8e7f6ead38 upstream. + +Instantiated I2C device nodes are marked with OF_POPULATE. This was +introduced in 4f001fd30145a6. On unloading, loaded device nodes will of +course be unmarked. The problem are nodes that fail during +initialisation: If a node fails, it won't be unloaded and hence not be +unmarked. + +If a I2C driver module is unloaded and reloaded, it will skip nodes that +failed before. + +Skip device nodes that are already populated and mark them only in case +of success. + +Fixes: 4f001fd30145a6 ("i2c: Mark instantiated device nodes with OF_POPULATE") +Signed-off-by: Ralf Ramsauer +Reviewed-by: Geert Uytterhoeven +Acked-by: Pantelis Antoniou +[wsa: use 14-digit commit sha] +Signed-off-by: Wolfram Sang +Signed-off-by: Greg Kroah-Hartman + + +--- + drivers/i2c/i2c-core.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +--- a/drivers/i2c/i2c-core.c ++++ b/drivers/i2c/i2c-core.c +@@ -1592,6 +1592,7 @@ static struct i2c_client *of_i2c_registe + static void of_i2c_register_devices(struct i2c_adapter *adap) + { + struct device_node *node; ++ struct i2c_client *client; + + /* Only register child devices if the adapter has a node pointer set */ + if (!adap->dev.of_node) +@@ -1602,7 +1603,14 @@ static void of_i2c_register_devices(stru + for_each_available_child_of_node(adap->dev.of_node, node) { + if (of_node_test_and_set_flag(node, OF_POPULATED)) + continue; +- of_i2c_register_device(adap, node); ++ ++ client = of_i2c_register_device(adap, node); ++ if (IS_ERR(client)) { ++ dev_warn(&adap->dev, ++ "Failed to create I2C device for %s\n", ++ node->full_name); ++ of_node_clear_flag(node, OF_POPULATED); ++ } + } + } + +@@ -2201,6 +2209,7 @@ static int of_i2c_notify(struct notifier + if (IS_ERR(client)) { + dev_err(&adap->dev, "failed to create client for '%s'\n", + rd->dn->full_name); ++ of_node_clear_flag(rd->dn, OF_POPULATED); + return notifier_from_errno(PTR_ERR(client)); + } + break; diff --git a/queue-4.8/netfilter-xt_nflog-fix-unexpected-truncated-packet.patch b/queue-4.8/netfilter-xt_nflog-fix-unexpected-truncated-packet.patch new file mode 100644 index 00000000000..5aac608de5a --- /dev/null +++ b/queue-4.8/netfilter-xt_nflog-fix-unexpected-truncated-packet.patch @@ -0,0 +1,39 @@ +From 6d19375b58763fefc2f215fb45117d3353ced888 Mon Sep 17 00:00:00 2001 +From: Liping Zhang +Date: Tue, 11 Oct 2016 21:03:45 +0800 +Subject: netfilter: xt_NFLOG: fix unexpected truncated packet + +From: Liping Zhang + +commit 6d19375b58763fefc2f215fb45117d3353ced888 upstream. + +Justin and Chris spotted that iptables NFLOG target was broken when they +upgraded the kernel to 4.8: "ulogd-2.0.5- IPs are no longer logged" or +"results in segfaults in ulogd-2.0.5". + +Because "struct nf_loginfo li;" is a local variable, and flags will be +filled with garbage value, not inited to zero. So if it contains 0x1, +packets will not be logged to the userspace anymore. + +Fixes: 7643507fe8b5 ("netfilter: xt_NFLOG: nflog-range does not truncate packets") +Reported-by: Justin Piszcz +Reported-by: Chris Caputo +Tested-by: Chris Caputo +Signed-off-by: Liping Zhang +Signed-off-by: Pablo Neira Ayuso +Signed-off-by: Greg Kroah-Hartman + +--- + net/netfilter/xt_NFLOG.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/net/netfilter/xt_NFLOG.c ++++ b/net/netfilter/xt_NFLOG.c +@@ -32,6 +32,7 @@ nflog_tg(struct sk_buff *skb, const stru + li.u.ulog.copy_len = info->len; + li.u.ulog.group = info->group; + li.u.ulog.qthreshold = info->threshold; ++ li.u.ulog.flags = 0; + + if (info->flags & XT_NFLOG_F_COPY_LEN) + li.u.ulog.flags |= NF_LOG_F_COPY_LEN; diff --git a/queue-4.8/series b/queue-4.8/series index 7ae6d47cbb3..fcfefb529f3 100644 --- a/queue-4.8/series +++ b/queue-4.8/series @@ -119,3 +119,5 @@ drm-i915-respect-alternate_aux_channel-for-all-ddi-ports.patch drm-i915-clean-up-ddi-ddc-aux-ch-sanitation.patch drm-i915-fbc-fix-cfb-size-calculation-for-gen8.patch drm-i915-wait-for-fences-on-new-fb-not-old.patch +i2c-mark-device-nodes-only-in-case-of-successful-instantiation.patch +netfilter-xt_nflog-fix-unexpected-truncated-packet.patch