Commit 63b5e505 authored by Nam Cao's avatar Nam Cao Committed by Greg Kroah-Hartman
Browse files

staging: rtl8712: check for alloc fail in _r8712_init_recv_priv() 



The function _r8712_init_recv_priv() and also r8712_init_recv_priv()
just returns silently if they fail to allocate memory. Change their
return type to int and add necessary checks and handling if they return
-ENOMEM

Tested-by: default avatarPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Signed-off-by: default avatarNam Cao <namcaov@gmail.com>
Link: https://lore.kernel.org/r/506ac35a667e511db568b06b86834fd0ceeba453.1666688642.git.namcaov@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c5a7eecd

drivers/staging/rtl8712/os_intfs.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -309,7 +309,9 @@ int r8712_init_drv_sw(struct _adapter *padapter) 
	if (ret)

	if (ret)

		return ret;

		return ret;

	_r8712_init_xmit_priv(&padapter->xmitpriv, padapter);

	_r8712_init_xmit_priv(&padapter->xmitpriv, padapter);

	_r8712_init_recv_priv(&padapter->recvpriv, padapter);

	ret = _r8712_init_recv_priv(&padapter->recvpriv, padapter);

	if (ret)

		return ret;

	memset((unsigned char *)&padapter->securitypriv, 0,

	memset((unsigned char *)&padapter->securitypriv, 0,

	       sizeof(struct security_priv));

	       sizeof(struct security_priv));

	timer_setup(&padapter->securitypriv.tkip_timer,

	timer_setup(&padapter->securitypriv.tkip_timer,

drivers/staging/rtl8712/recv_osdep.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -18,14 +18,14 @@ 
#include "drv_types.h"

#include "drv_types.h"

#include <linux/skbuff.h>

#include <linux/skbuff.h>





void _r8712_init_recv_priv(struct recv_priv *precvpriv,

int _r8712_init_recv_priv(struct recv_priv *precvpriv,

			  struct _adapter *padapter);

			  struct _adapter *padapter);

void _r8712_free_recv_priv(struct recv_priv *precvpriv);

void _r8712_free_recv_priv(struct recv_priv *precvpriv);

void r8712_recv_entry(union recv_frame *precv_frame);

void r8712_recv_entry(union recv_frame *precv_frame);

void r8712_recv_indicatepkt(struct _adapter *adapter,

void r8712_recv_indicatepkt(struct _adapter *adapter,

			    union recv_frame *precv_frame);

			    union recv_frame *precv_frame);

void r8712_handle_tkip_mic_err(struct _adapter *padapter, u8 bgroup);

void r8712_handle_tkip_mic_err(struct _adapter *padapter, u8 bgroup);

void r8712_init_recv_priv(struct recv_priv *precvpriv,

int r8712_init_recv_priv(struct recv_priv *precvpriv,

			 struct _adapter *padapter);

			 struct _adapter *padapter);

void r8712_free_recv_priv(struct recv_priv *precvpriv);

void r8712_free_recv_priv(struct recv_priv *precvpriv);

void r8712_os_recv_resource_alloc(struct _adapter *padapter,

void r8712_os_recv_resource_alloc(struct _adapter *padapter,

drivers/staging/rtl8712/rtl8712_recv.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -30,7 +30,7 @@ 




static void recv_tasklet(struct tasklet_struct *t);

static void recv_tasklet(struct tasklet_struct *t);





void r8712_init_recv_priv(struct recv_priv *precvpriv,

int r8712_init_recv_priv(struct recv_priv *precvpriv,

			 struct _adapter *padapter)

			 struct _adapter *padapter)

{

{

	int i;

	int i;
@@ -44,7 +44,7 @@ void r8712_init_recv_priv(struct recv_priv *precvpriv, 
	precvpriv->pallocated_recv_buf =

	precvpriv->pallocated_recv_buf =

		kzalloc(NR_RECVBUFF * sizeof(struct recv_buf) + 4, GFP_ATOMIC);

		kzalloc(NR_RECVBUFF * sizeof(struct recv_buf) + 4, GFP_ATOMIC);

	if (!precvpriv->pallocated_recv_buf)

	if (!precvpriv->pallocated_recv_buf)

		return;

		return -ENOMEM;

	precvpriv->precv_buf = precvpriv->pallocated_recv_buf + 4 -

	precvpriv->precv_buf = precvpriv->pallocated_recv_buf + 4 -

			      ((addr_t)(precvpriv->pallocated_recv_buf) & 3);

			      ((addr_t)(precvpriv->pallocated_recv_buf) & 3);

	precvbuf = (struct recv_buf *)precvpriv->precv_buf;

	precvbuf = (struct recv_buf *)precvpriv->precv_buf;
@@ -75,6 +75,7 @@ void r8712_init_recv_priv(struct recv_priv *precvpriv, 
		}

		}

		pskb = NULL;

		pskb = NULL;

	}

	}

	return 0;

}

}





void r8712_free_recv_priv(struct recv_priv *precvpriv)

void r8712_free_recv_priv(struct recv_priv *precvpriv)

drivers/staging/rtl8712/rtl871x_recv.c

+9 −4
Original line number Original line Diff line number Diff line
@@ -42,9 +42,10 @@ void _r8712_init_sta_recv_priv(struct sta_recv_priv *psta_recvpriv) 
	_init_queue(&psta_recvpriv->defrag_q);

	_init_queue(&psta_recvpriv->defrag_q);

}

}





void _r8712_init_recv_priv(struct recv_priv *precvpriv,

int _r8712_init_recv_priv(struct recv_priv *precvpriv,

			  struct _adapter *padapter)

			  struct _adapter *padapter)

{

{

	int ret;

	sint i;

	sint i;

	union recv_frame *precvframe;

	union recv_frame *precvframe;
@@ -58,7 +59,7 @@ void _r8712_init_recv_priv(struct recv_priv *precvpriv, 
				sizeof(union recv_frame) + RXFRAME_ALIGN_SZ,

				sizeof(union recv_frame) + RXFRAME_ALIGN_SZ,

				GFP_ATOMIC);

				GFP_ATOMIC);

	if (!precvpriv->pallocated_frame_buf)

	if (!precvpriv->pallocated_frame_buf)

		return;

		return -ENOMEM;

	precvpriv->precv_frame_buf = precvpriv->pallocated_frame_buf +

	precvpriv->precv_frame_buf = precvpriv->pallocated_frame_buf +

				    RXFRAME_ALIGN_SZ -

				    RXFRAME_ALIGN_SZ -

				    ((addr_t)(precvpriv->pallocated_frame_buf) &

				    ((addr_t)(precvpriv->pallocated_frame_buf) &
@@ -73,7 +74,11 @@ void _r8712_init_recv_priv(struct recv_priv *precvpriv, 
		precvframe++;

		precvframe++;

	}

	}

	precvpriv->rx_pending_cnt = 1;

	precvpriv->rx_pending_cnt = 1;

	r8712_init_recv_priv(precvpriv, padapter);

	ret = r8712_init_recv_priv(precvpriv, padapter);

	if (ret)

		kfree(precvpriv->pallocated_frame_buf);



	return ret;

}

}





void _r8712_free_recv_priv(struct recv_priv *precvpriv)

void _r8712_free_recv_priv(struct recv_priv *precvpriv)