Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 291b93ca authored by Fengguang Wu's avatar Fengguang Wu Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: fix memdup.cocci warnings 



drivers/staging/wilc1000/host_interface.c:946:32-39: WARNING opportunity for kmemdup
drivers/staging/wilc1000/host_interface.c:970:30-37: WARNING opportunity for kmemdup

 Use kmemdup rather than duplicating its implementation

Generated by: scripts/coccinelle/api/memdup.cocci

Fixes: aaea2164 ("staging: wilc1000: check for kmalloc allocation failures")
CC: Colin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Signed-off-by: default avatarJulia Lawall <julia.lawall@lip6.fr>
Reviewed-by: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2415fa8f

drivers/staging/wilc1000/host_interface.c

+4 −6
Original line number Diff line number Diff line
@@ -936,12 +936,12 @@ static s32 handle_connect(struct wilc_vif *vif, 
	}



	if (conn_attr->bssid) {

		hif_drv->usr_conn_req.bssid = kmalloc(6, GFP_KERNEL);

		hif_drv->usr_conn_req.bssid = kmemdup(conn_attr->bssid, 6,

						      GFP_KERNEL);

		if (!hif_drv->usr_conn_req.bssid) {

			result = -ENOMEM;

			goto error;

		}

		memcpy(hif_drv->usr_conn_req.bssid, conn_attr->bssid, 6);

	}



	hif_drv->usr_conn_req.ssid_len = conn_attr->ssid_len;
@@ -960,15 +960,13 @@ static s32 handle_connect(struct wilc_vif *vif, 


	hif_drv->usr_conn_req.ies_len = conn_attr->ies_len;

	if (conn_attr->ies) {

		hif_drv->usr_conn_req.ies = kmalloc(conn_attr->ies_len,

		hif_drv->usr_conn_req.ies = kmemdup(conn_attr->ies,

						    conn_attr->ies_len,

						    GFP_KERNEL);

		if (!hif_drv->usr_conn_req.ies) {

			result = -ENOMEM;

			goto error;

		}

		memcpy(hif_drv->usr_conn_req.ies,

		       conn_attr->ies,

		       conn_attr->ies_len);

	}



	hif_drv->usr_conn_req.security = conn_attr->security;