Commit 9e8e9187 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Kalle Valo

wifi: ray_cs: Utilize strnlen() in parse_addr()

Instead of doing simple operations and using an additional variable on stack,
utilize strnlen() and reuse len variable.
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20220603164414.48436-1-andriy.shevchenko@linux.intel.com
parent d38c9df5
...@@ -1643,31 +1643,29 @@ static void authenticate_timeout(struct timer_list *t) ...@@ -1643,31 +1643,29 @@ static void authenticate_timeout(struct timer_list *t)
/*===========================================================================*/ /*===========================================================================*/
static int parse_addr(char *in_str, UCHAR *out) static int parse_addr(char *in_str, UCHAR *out)
{ {
int i, k;
int len; int len;
int i, j, k;
int status; int status;
if (in_str == NULL) if (in_str == NULL)
return 0; return 0;
if ((len = strlen(in_str)) < 2) len = strnlen(in_str, ADDRLEN * 2 + 1) - 1;
if (len < 1)
return 0; return 0;
memset(out, 0, ADDRLEN); memset(out, 0, ADDRLEN);
status = 1; status = 1;
j = len - 1;
if (j > 12)
j = 12;
i = 5; i = 5;
while (j > 0) { while (len > 0) {
if ((k = hex_to_bin(in_str[j--])) != -1) if ((k = hex_to_bin(in_str[len--])) != -1)
out[i] = k; out[i] = k;
else else
return 0; return 0;
if (j == 0) if (len == 0)
break; break;
if ((k = hex_to_bin(in_str[j--])) != -1) if ((k = hex_to_bin(in_str[len--])) != -1)
out[i] += k << 4; out[i] += k << 4;
else else
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment