diff mbox

rtl8xxxu: Check return value of kmemdup()

Message ID 1452601604-11309-1-git-send-email-tklauser@distanz.ch (mailing list archive)
State Not Applicable
Delegated to: Kalle Valo
Headers show

Commit Message

Tobias Klauser Jan. 12, 2016, 12:26 p.m. UTC
In rtl8xxxu_load_firmware() check the return value of kmemdup() and
error out with -ENOMEM in case of NULL to prevent a NULL pointer
dereference.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
---
 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Jes Sorensen Jan. 12, 2016, 11:34 p.m. UTC | #1
Tobias Klauser <tklauser@distanz.ch> writes:
> In rtl8xxxu_load_firmware() check the return value of kmemdup() and
> error out with -ENOMEM in case of NULL to prevent a NULL pointer
> dereference.
>
> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
> ---
>  drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c | 4 ++++
>  1 file changed, 4 insertions(+)

Thanks, I'll add it to my queue!

Jes

>
> diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
> index 7d820c395375..59f70513c491 100644
> --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
> +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
> @@ -2174,6 +2174,10 @@ static int rtl8xxxu_load_firmware(struct rtl8xxxu_priv *priv, char *fw_name)
>  	}
>  
>  	priv->fw_data = kmemdup(fw->data, fw->size, GFP_KERNEL);
> +	if (!priv->fw_data) {
> +		ret = -ENOMEM;
> +		goto exit;
> +	}
>  	priv->fw_size = fw->size - sizeof(struct rtl8xxxu_firmware_header);
>  
>  	signature = le16_to_cpu(priv->fw_data->signature);
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
index 7d820c395375..59f70513c491 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
@@ -2174,6 +2174,10 @@  static int rtl8xxxu_load_firmware(struct rtl8xxxu_priv *priv, char *fw_name)
 	}
 
 	priv->fw_data = kmemdup(fw->data, fw->size, GFP_KERNEL);
+	if (!priv->fw_data) {
+		ret = -ENOMEM;
+		goto exit;
+	}
 	priv->fw_size = fw->size - sizeof(struct rtl8xxxu_firmware_header);
 
 	signature = le16_to_cpu(priv->fw_data->signature);