From d4e18cc31d5e6ea6b461a55b58ade47d4f12c06e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 2 Feb 2013 15:52:24 +0100 Subject: [PATCH] 3.7-stable patches added patches: netfilter-xt_ct-fix-unset-return-value-if-conntrack-zone.patch --- ...unset-return-value-if-conntrack-zone.patch | 47 +++++++++++++++++++ queue-3.7/series | 1 + 2 files changed, 48 insertions(+) create mode 100644 queue-3.7/netfilter-xt_ct-fix-unset-return-value-if-conntrack-zone.patch diff --git a/queue-3.7/netfilter-xt_ct-fix-unset-return-value-if-conntrack-zone.patch b/queue-3.7/netfilter-xt_ct-fix-unset-return-value-if-conntrack-zone.patch new file mode 100644 index 00000000000..86477214bd0 --- /dev/null +++ b/queue-3.7/netfilter-xt_ct-fix-unset-return-value-if-conntrack-zone.patch @@ -0,0 +1,47 @@ +From 4610476d89d53714ca94aae081fa035908bc137a Mon Sep 17 00:00:00 2001 +From: Pablo Neira Ayuso +Date: Thu, 10 Jan 2013 12:42:15 +0100 +Subject: netfilter: xt_CT: fix unset return value if conntrack zone + are disabled +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Pablo Neira Ayuso + +commit 4610476d89d53714ca94aae081fa035908bc137a upstream. + +net/netfilter/xt_CT.c: In function ‘xt_ct_tg_check_v1’: +net/netfilter/xt_CT.c:250:6: warning: ‘ret’ may be used uninitialized in this function [-Wmaybe-uninitialized] +net/netfilter/xt_CT.c: In function ‘xt_ct_tg_check_v0’: +net/netfilter/xt_CT.c:112:6: warning: ‘ret’ may be used uninitialized in this function [-Wmaybe-uninitialized] + +Reported-by: Borislav Petkov +Acked-by: Borislav Petkov +Signed-off-by: Pablo Neira Ayuso +Signed-off-by: Greg Kroah-Hartman + +--- + net/netfilter/xt_CT.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/net/netfilter/xt_CT.c ++++ b/net/netfilter/xt_CT.c +@@ -109,7 +109,7 @@ static int xt_ct_tg_check_v0(const struc + struct xt_ct_target_info *info = par->targinfo; + struct nf_conntrack_tuple t; + struct nf_conn *ct; +- int ret; ++ int ret = -EOPNOTSUPP; + + if (info->flags & ~XT_CT_NOTRACK) + return -EINVAL; +@@ -243,7 +243,7 @@ static int xt_ct_tg_check_v1(const struc + struct xt_ct_target_info_v1 *info = par->targinfo; + struct nf_conntrack_tuple t; + struct nf_conn *ct; +- int ret; ++ int ret = -EOPNOTSUPP; + + if (info->flags & ~XT_CT_NOTRACK) + return -EINVAL; diff --git a/queue-3.7/series b/queue-3.7/series index 2a737b3bcb7..cd6f541e769 100644 --- a/queue-3.7/series +++ b/queue-3.7/series @@ -87,3 +87,4 @@ netfilter-x_tables-print-correct-hook-names-for-arp.patch netfilter-ctnetlink-fix-leak-in-error-path-of-ctnetlink_create_expect.patch drm-i915-fix-forcewake-posting-reads.patch slub-assign-refcount-for-kmalloc_caches.patch +netfilter-xt_ct-fix-unset-return-value-if-conntrack-zone.patch -- 2.47.3