From: Roland Vossen <rvossen@broadcom.com>
Date: Tue, 5 Jul 2011 22:02:57 +0000 (+0200)
Subject: staging: brcm80211: simpler string handling in brcmf_c_pktfilter_offload_set()
X-Git-Tag: MMI-PSA29.97-13-9~18845^2~135
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4b1524cea8b44104e8ae6e67fff6039f1102e75e;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

staging: brcm80211: simpler string handling in brcmf_c_pktfilter_offload_set()

Replaced two functions with strcpy().

Reported-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_common.c b/drivers/staging/brcm80211/brcmfmac/dhd_common.c
index c37128d1d970..fdec4683c422 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_common.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_common.c
@@ -958,13 +958,7 @@ void brcmf_c_pktfilter_offload_set(struct brcmf_pub *drvr, char *arg)
 		goto fail;
 	}
 
-	memcpy(arg_save, arg, strlen(arg) + 1);
-
-	if (strlen(arg) > PKTFILTER_BUF_SIZE) {
-		BRCMF_ERROR(("Not enough buffer %d < %d\n", (int)strlen(arg),
-			     (int)sizeof(buf)));
-		goto fail;
-	}
+	strcpy(arg_save, arg);
 
 	argv[i] = strsep(&arg_save, " ");
 	while (argv[i++])
@@ -977,9 +971,8 @@ void brcmf_c_pktfilter_offload_set(struct brcmf_pub *drvr, char *arg)
 	}
 
 	str = "pkt_filter_add";
+	strcpy(buf, str);
 	str_len = strlen(str);
-	strncpy(buf, str, str_len);
-	buf[str_len] = '\0';
 	buf_len = str_len + 1;
 
 	pkt_filterp = (struct brcmf_pkt_filter *) (buf + str_len + 1);