1 files changed, 6 insertions, 6 deletions
diff --git a/net/netfilter/xt_socket.c b/net/netfilter/xt_socket.c
index 9ea482d08cf..63b2bdb59e9 100644
--- a/net/netfilter/xt_socket.c
+++ b/net/netfilter/xt_socket.c
@@ -108,9 +108,9 @@ socket_match(const struct sk_buff *skb, struct xt_action_param *par,
        const struct iphdr *iph = ip_hdr(skb);
        struct udphdr _hdr, *hp = NULL;
        struct sock *sk;
-        __be32 daddr, saddr;
+        __be32 uninitialized_var(daddr), uninitialized_var(saddr);
-        __be16 dport, sport;
+        __be16 uninitialized_var(dport), uninitialized_var(sport);
-        u8 protocol;
+        u8 uninitialized_var(protocol);
 #ifdef XT_SOCKET_HAVE_CONNTRACK
        struct nf_conn const *ct;
        enum ip_conntrack_info ctinfo;
@@ -261,9 +261,9 @@ socket_mt6_v1(const struct sk_buff *skb, struct xt_action_param *par)
        struct ipv6hdr *iph = ipv6_hdr(skb);
        struct udphdr _hdr, *hp = NULL;
        struct sock *sk;
-        struct in6_addr *daddr, *saddr;
+        struct in6_addr *daddr = NULL, *saddr = NULL;
-        __be16 dport, sport;
+        __be16 uninitialized_var(dport), uninitialized_var(sport);
-        int thoff = 0, tproto;
+        int thoff = 0, uninitialized_var(tproto);
        const struct xt_socket_mtinfo1 *info = (struct xt_socket_mtinfo1 *) par->matchinfo;
        tproto = ipv6_find_hdr(skb, &thoff, -1, NULL, NULL);

diff --git a/net/netfilter/xt_socket.c b/net/netfilter/xt_socket.c index 9ea482d08cf..63b2bdb59e9 100644 --- a/net/netfilter/xt_socket.c +++ b/net/netfilter/xt_socket.c
@@ -108,9 +108,9 @@ socket_match(const struct sk_buff skb, struct xt_action_param par,
108	const struct iphdr *iph = ip_hdr(skb);	108	const struct iphdr *iph = ip_hdr(skb);
109	struct udphdr _hdr, *hp = NULL;	109	struct udphdr _hdr, *hp = NULL;
110	struct sock *sk;	110	struct sock *sk;
111	__be32 daddr, saddr;	111	__be32 uninitialized_var(daddr), uninitialized_var(saddr);
112	__be16 dport, sport;	112	__be16 uninitialized_var(dport), uninitialized_var(sport);
113	u8 protocol;	113	u8 uninitialized_var(protocol);
114	#ifdef XT_SOCKET_HAVE_CONNTRACK	114	#ifdef XT_SOCKET_HAVE_CONNTRACK
115	struct nf_conn const *ct;	115	struct nf_conn const *ct;
116	enum ip_conntrack_info ctinfo;	116	enum ip_conntrack_info ctinfo;
@@ -261,9 +261,9 @@ socket_mt6_v1(const struct sk_buff skb, struct xt_action_param par)
261	struct ipv6hdr *iph = ipv6_hdr(skb);	261	struct ipv6hdr *iph = ipv6_hdr(skb);
262	struct udphdr _hdr, *hp = NULL;	262	struct udphdr _hdr, *hp = NULL;
263	struct sock *sk;	263	struct sock *sk;
264	struct in6_addr daddr, saddr;	264	struct in6_addr daddr = NULL, saddr = NULL;
265	__be16 dport, sport;	265	__be16 uninitialized_var(dport), uninitialized_var(sport);
266	int thoff = 0, tproto;	266	int thoff = 0, uninitialized_var(tproto);
267	const struct xt_socket_mtinfo1 info = (struct xt_socket_mtinfo1 ) par->matchinfo;	267	const struct xt_socket_mtinfo1 info = (struct xt_socket_mtinfo1 ) par->matchinfo;
268		268
269	tproto = ipv6_find_hdr(skb, &thoff, -1, NULL, NULL);	269	tproto = ipv6_find_hdr(skb, &thoff, -1, NULL, NULL);