aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJay Vosburgh <fubar@us.ibm.com>2008-01-29 21:07:43 -0500
committerDavid S. Miller <davem@davemloft.net>2008-02-03 07:28:11 -0500
commita42e534f1b6be7f2f68f83d29588c3f2736b4d25 (patch)
tree5a5d0ef85a0c71e4c290c130ee99b1b5beea5cfc /drivers
parentc800c5c9db9c621b2c1d70c3ae6532fafe2db69d (diff)
bonding: fix parameter parsing
My last fix (commit ece95f7fefe3afae19e641e1b3f5e64b00d5b948) 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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/bonding/bond_main.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 2039f7838f2d..2766855a5aee 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -4549,14 +4549,19 @@ static void bond_free_all(void)
4549int bond_parse_parm(const char *buf, struct bond_parm_tbl *tbl) 4549int bond_parse_parm(const char *buf, struct bond_parm_tbl *tbl)
4550{ 4550{
4551 int mode = -1, i, rv; 4551 int mode = -1, i, rv;
4552 char modestr[BOND_MAX_MODENAME_LEN + 1] = { 0, }; 4552 char *p, modestr[BOND_MAX_MODENAME_LEN + 1] = { 0, };
4553 4553
4554 rv = sscanf(buf, "%d", &mode); 4554 for (p = (char *)buf; *p; p++)
4555 if (!rv) { 4555 if (!(isdigit(*p) || isspace(*p)))
4556 break;
4557
4558 if (*p)
4556 rv = sscanf(buf, "%20s", modestr); 4559 rv = sscanf(buf, "%20s", modestr);
4557 if (!rv) 4560 else
4558 return -1; 4561 rv = sscanf(buf, "%d", &mode);
4559 } 4562
4563 if (!rv)
4564 return -1;
4560 4565
4561 for (i = 0; tbl[i].modename; i++) { 4566 for (i = 0; tbl[i].modename; i++) {
4562 if (mode == tbl[i].mode) 4567 if (mode == tbl[i].mode)