mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-09 06:43:09 +00:00
s390/qeth: clean up string ops in qeth_l3_parse_ipatoe()
Indicate the max number of to-be-parsed characters, and avoid copying the address sub-string. Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
d6e6426f69
commit
bcdfdf0047
@ -409,21 +409,22 @@ static ssize_t qeth_l3_dev_ipato_add4_show(struct device *dev,
|
||||
static int qeth_l3_parse_ipatoe(const char *buf, enum qeth_prot_versions proto,
|
||||
u8 *addr, int *mask_bits)
|
||||
{
|
||||
const char *start, *end;
|
||||
char *tmp;
|
||||
char buffer[40] = {0, };
|
||||
const char *start;
|
||||
char *sep, *tmp;
|
||||
int rc;
|
||||
|
||||
start = buf;
|
||||
/* get address string */
|
||||
end = strchr(start, '/');
|
||||
if (!end || (end - start >= 40)) {
|
||||
/* Expected input pattern: %addr/%mask */
|
||||
sep = strnchr(buf, 40, '/');
|
||||
if (!sep)
|
||||
return -EINVAL;
|
||||
}
|
||||
strncpy(buffer, start, end - start);
|
||||
if (qeth_l3_string_to_ipaddr(buffer, proto, addr)) {
|
||||
return -EINVAL;
|
||||
}
|
||||
start = end + 1;
|
||||
|
||||
/* Terminate the %addr sub-string, and parse it: */
|
||||
*sep = '\0';
|
||||
rc = qeth_l3_string_to_ipaddr(buf, proto, addr);
|
||||
if (rc)
|
||||
return rc;
|
||||
|
||||
start = sep + 1;
|
||||
*mask_bits = simple_strtoul(start, &tmp, 10);
|
||||
if (!strlen(start) ||
|
||||
(tmp == start) ||
|
||||
|
Loading…
Reference in New Issue
Block a user