netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Chen Gang <gang.chen.5i5j@gmail.com>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: rkuo <rkuo@codeaurora.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	David Miller <davem@davemloft.net>,
	linux-wireless@vger.kernel.org, netdev <netdev@vger.kernel.org>
Subject: [PATCH] net: mac80211: tx.c: be sure of 'sdata->vif.type' must be NL80211_IFTYPE_AP when be in NL80211_IFTYPE_AP case
Date: Wed, 27 Nov 2013 12:53:46 +0800	[thread overview]
Message-ID: <52957ADA.2080704@gmail.com> (raw)
In-Reply-To: <5294255E.7040105@gmail.com>

In next-20131122 tree, if "sdata->vif.type != NL80211_IFTYPE_AP",
'chanctx_conf' will be not initialized, so need check it. Related
warning (with allmodconfig under hexagon):

    CC [M]  net/mac80211/tx.o
  net/mac80211/tx.c: In function 'ieee80211_subif_start_xmit':
  net/mac80211/tx.c:1827:27: warning: 'chanctx_conf' may be used uninitialized in this function [-Wuninitialized]


Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
---
 net/mac80211/tx.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index c558b24..f3245d6 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1814,8 +1814,9 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb,
 			break;
 		/* fall through */
 	case NL80211_IFTYPE_AP:
-		if (sdata->vif.type == NL80211_IFTYPE_AP)
-			chanctx_conf = rcu_dereference(sdata->vif.chanctx_conf);
+		if (sdata->vif.type != NL80211_IFTYPE_AP)
+			goto fail_rcu;
+		chanctx_conf = rcu_dereference(sdata->vif.chanctx_conf);
 		if (!chanctx_conf)
 			goto fail_rcu;
 		fc |= cpu_to_le16(IEEE80211_FCTL_FROMDS);
-- 
1.7.7.6

       reply	other threads:[~2013-11-27  4:53 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <528AEFB7.4060301@gmail.com>
     [not found] ` <20131125011938.GB18921@codeaurora.org>
     [not found]   ` <5292B845.3010404@gmail.com>
     [not found]     ` <5292B8A0.7020409@gmail.com>
     [not found]       ` <5294255E.7040105@gmail.com>
2013-11-27  4:53         ` Chen Gang [this message]
2013-11-29 15:38           ` [PATCH] net: mac80211: tx.c: be sure of 'sdata->vif.type' must be NL80211_IFTYPE_AP when be in NL80211_IFTYPE_AP case Johannes Berg
2013-11-30 11:59             ` Chen Gang
2013-11-30 12:53               ` Johannes Berg
     [not found]                 ` <1385816013.4327.1.camel-8Nb76shvtaUJvtFkdXX2HixXY32XiHfO@public.gmane.org>
2013-11-30 13:50                   ` Chen Gang
2013-11-30 14:02                     ` Chen Gang
2013-11-30 20:08                       ` Johannes Berg
2013-11-30 20:39                         ` Joe Perches
2013-11-30 23:48                           ` Chen Gang
     [not found]                             ` <529A7955.9010507-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2013-11-30 23:59                               ` Chen Gang
2013-12-01  9:37                             ` Johannes Berg
     [not found]                               ` <1385890647.4171.3.camel-8Nb76shvtaUJvtFkdXX2HixXY32XiHfO@public.gmane.org>
2013-12-01 11:50                                 ` Chen Gang
2013-12-01  9:35                           ` Johannes Berg
2013-12-01 22:38                             ` Joe Perches
2013-12-02  0:45                               ` Chen Gang
2013-12-02 14:48                               ` Johannes Berg
2013-12-04  2:12                                 ` Chen Gang
     [not found]                                   ` <529E8F90.1020205-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2013-12-04  8:04                                     ` Johannes Berg
2013-12-04  8:41                                       ` Chen Gang
2013-12-04  8:49                                         ` Johannes Berg
2013-12-04  9:00                                           ` Chen Gang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=52957ADA.2080704@gmail.com \
    --to=gang.chen.5i5j@gmail.com \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    --cc=netdev@vger.kernel.org \
    --cc=rkuo@codeaurora.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).