From 8872ab4e6c8c9e06985d14aff562fa2daf80eb62 Mon Sep 17 00:00:00 2001 From: Nathan Chancellor Date: Thu, 26 Jan 2017 21:06:04 -0700 Subject: net: netfilter: fix maybe-uninitialized warning net/netfilter/nf_conntrack_h323_main.c: In function 'h245_help': net/netfilter/nf_conntrack_h323_main.c:178:11: warning: 'dataoff' may be used uninitialized in this function [-Wmaybe-uninitialized] tpktoff = *dataoff + *datalen; ~~~~~~~~^~~~~~~~~~~~~~~~~~~~~ net/netfilter/nf_conntrack_h323_main.c:588:6: note: 'dataoff' was declared here int dataoff; ^~~~~~~ net/netfilter/nf_conntrack_h323_main.c:182:18: warning: 'datalen' may be used uninitialized in this function [-Wmaybe-uninitialized] tpkt = *data + *datalen; ^~~~~~~~ net/netfilter/nf_conntrack_h323_main.c:587:6: note: 'datalen' was declared here int datalen; ^~~~~~~ net/netfilter/nf_conntrack_h323_main.c: In function 'q931_help': net/netfilter/nf_conntrack_h323_main.c:178:11: warning: 'dataoff' may be used uninitialized in this function [-Wmaybe-uninitialized] tpktoff = *dataoff + *datalen; ~~~~~~~~^~~~~~~~~~~~~~~~~~~~~ net/netfilter/nf_conntrack_h323_main.c:1163:6: note: 'dataoff' was declared here int dataoff; ^~~~~~~ net/netfilter/nf_conntrack_h323_main.c:182:18: warning: 'datalen' may be used uninitialized in this function [-Wmaybe-uninitialized] tpkt = *data + *datalen; ^~~~~~~~ net/netfilter/nf_conntrack_h323_main.c:1162:6: note: 'datalen' was declared here int datalen; ^~~~~~~ Signed-off-by: Nathan Chancellor --- net/netfilter/nf_conntrack_h323_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/netfilter/nf_conntrack_h323_main.c b/net/netfilter/nf_conntrack_h323_main.c index 70866d192..2b7ae4174 100644 --- a/net/netfilter/nf_conntrack_h323_main.c +++ b/net/netfilter/nf_conntrack_h323_main.c @@ -584,8 +584,8 @@ static int h245_help(struct sk_buff *skb, unsigned int protoff, { static MultimediaSystemControlMessage mscm; unsigned char *data = NULL; - int datalen; - int dataoff; + int datalen = 0; + int dataoff = 0; int ret; /* Until there's been traffic both ways, don't look in packets. */ @@ -1159,8 +1159,8 @@ static int q931_help(struct sk_buff *skb, unsigned int protoff, { static Q931 q931; unsigned char *data = NULL; - int datalen; - int dataoff; + int datalen = 0; + int dataoff = 0; int ret; /* Until there's been traffic both ways, don't look in packets. */ -- cgit v1.2.3