Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1296767

Re: [PATCH v4] staging: rtl8192u: fix large frame size compiler warning

Show all headers | View raw

On Thu, Dec 17, 2015 at 08:30:38PM +0000, Okash Khawaja wrote:
> This patch fixes following compiler warning:
> 
> drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c: In function
> ‘RxReorderIndicatePacket’:
> drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c:758:1: warning: the
> frame size of 1064 bytes is larger than 1024 bytes
> [-Wframe-larger-than=]
> 
> It replaces the statically allocated array prxbIndicateArray with
> a kmalloc'd one.
> 
> Signed-off-by: Okash Khawaja <okash.khawaja@gmail.com>
> ---
>  drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 13 ++++++++++++-
>  1 file changed, 12 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
> index 130c852..28ad63a 100644
> --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
> +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
> @@ -594,12 +594,18 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,
>  {
>  	PRT_HIGH_THROUGHPUT	pHTInfo = ieee->pHTInfo;
>  	PRX_REORDER_ENTRY	pReorderEntry = NULL;
> -	struct ieee80211_rxb *prxbIndicateArray[REORDER_WIN_SIZE];
> +	struct ieee80211_rxb **prxbIndicateArray;
>  	u8			WinSize = pHTInfo->RxReorderWinSize;
>  	u16			WinEnd = (pTS->RxIndicateSeq + WinSize -1)%4096;
>  	u8			index = 0;
>  	bool			bMatchWinStart = false, bPktInBuf = false;
>  	IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): Seq is %d,pTS->RxIndicateSeq is %d, WinSize is %d\n",__func__,SeqNum,pTS->RxIndicateSeq,WinSize);
> +
> +	prxbIndicateArray = kmalloc(sizeof(struct ieee80211_rxb *) *
> +			REORDER_WIN_SIZE, GFP_KERNEL);
> +	if (!prxbIndicateArray)
> +		return;
> +
>  	/* Rx Reorder initialize condition.*/
>  	if (pTS->RxIndicateSeq == 0xffff) {
>  		pTS->RxIndicateSeq = SeqNum;
> @@ -618,6 +624,8 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,
>  			kfree(prxb);
>  			prxb = NULL;
>  		}
> +
> +		kfree(prxbIndicateArray);
>  		return;
>  	}
>  
> @@ -741,6 +749,7 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,
>  		// Indicate packets
>  		if(index>REORDER_WIN_SIZE){
>  			IEEE80211_DEBUG(IEEE80211_DL_ERR, "RxReorderIndicatePacket(): Rx Reorer buffer full!! \n");
> +			kfree(prxbIndicateArray);
>  			return;
>  		}
>  		ieee80211_indicate_packets(ieee, prxbIndicateArray, index);
> @@ -755,6 +764,8 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,
>  		pTS->RxPktPendingTimer.expires = jiffies + MSECS(pHTInfo->RxReorderPendingTime);
>  		add_timer(&pTS->RxPktPendingTimer);
>  	}
> +
> +	kfree(prxbIndicateArray);
>  }
>  
>  static u8 parse_subframe(struct sk_buff *skb,
> -- 
> 2.5.2
> 
Hi,

Has a return path been missed out now?

Thanks,
Okash
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH] staging: rtl8192u: fix large frame size compiler warning Okash Khawaja <okash.khawaja@gmail.com> - 2015-12-16 23:20 +0100
  Re: [PATCH] staging: rtl8192u: fix large frame size compiler warning Okash Khawaja <okash.khawaja@gmail.com> - 2015-12-16 23:30 +0100
  [PATCH] staging: rtl8192u: fix large frame size compiler warning Okash Khawaja <okash.khawaja@gmail.com> - 2015-12-16 23:40 +0100
    Re: [PATCH] staging: rtl8192u: fix large frame size compiler warning Dan Carpenter <dan.carpenter@oracle.com> - 2015-12-17 12:10 +0100
      [PATCH v4] staging: rtl8192u: fix large frame size compiler warning Okash Khawaja <okash.khawaja@gmail.com> - 2015-12-17 21:40 +0100
        Re: [PATCH v4] staging: rtl8192u: fix large frame size compiler  warning Okash Khawaja <okash.khawaja@gmail.com> - 2015-12-22 13:50 +0100
          Re: [PATCH v4] staging: rtl8192u: fix large frame size compiler  warning Dan Carpenter <dan.carpenter@oracle.com> - 2015-12-22 14:30 +0100

csiph-web