lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bonding: fix parameter parsing

Browse Source 
My last fix (commit ece95f7fef)
didn't handle one case correctly.  This resolves that, and it will now
correctly parse parameters with arbitrary white space, and either text
names or mode values.

Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jay Vosburgh
2008-01-29 18:07:43 -08:00
committed by David S. Miller
parent c800c5c9db
commit a42e534f1b
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/net/bonding/bond_main.c
View File

@@ -4549,14 +4549,19 @@ static void bond_free_all(void)
int bond_parse_parm(const char *buf, struct bond_parm_tbl *tbl) int bond_parse_parm(const char *buf, struct bond_parm_tbl *tbl)
{ {
int mode = -1, i, rv; int mode = -1, i, rv;
char modestr[BOND_MAX_MODENAME_LEN + 1] = { 0, }; char *p, modestr[BOND_MAX_MODENAME_LEN + 1] = { 0, };
rv = sscanf(buf, "%d", &mode); for (p = (char *)buf; *p; p++)
if (!rv) { if (!(isdigit(*p) || isspace(*p)))
break;
if (*p)
rv = sscanf(buf, "%20s", modestr); rv = sscanf(buf, "%20s", modestr);
if (!rv) else
return -1; rv = sscanf(buf, "%d", &mode);
}
if (!rv)
return -1;
for (i = 0; tbl[i].modename; i++) { for (i = 0; tbl[i].modename; i++) {
if (mode == tbl[i].mode) if (mode == tbl[i].mode)