lkml.org 
[lkml]   [2013]   [Nov]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] net: mac80211: tx.c: be sure of 'sdata->vif.type' must be NL80211_IFTYPE_AP when be in NL80211_IFTYPE_AP case
    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

    \
     
     \ /
      Last update: 2013-11-27 06:41    [W:4.073 / U:0.748 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site