1 files changed, 16 insertions, 7 deletions

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 3ede0a2e6860..379c5d87c804 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -4540,18 +4540,27 @@ static void bond_free_all(void)
 
 /*
  * Convert string input module parms.  Accept either the
- * number of the mode or its string name.
+ * number of the mode or its string name.  A bit complicated because
+ * some mode names are substrings of other names, and calls from sysfs
+ * may have whitespace in the name (trailing newlines, for example).
  */
-int bond_parse_parm(char *mode_arg, struct bond_parm_tbl *tbl)
+int bond_parse_parm(const char *buf, struct bond_parm_tbl *tbl)
 {
-        int i;
+        int mode = -1, i, rv;
+        char modestr[BOND_MAX_MODENAME_LEN + 1] = { 0, };
+
+        rv = sscanf(buf, "%d", &mode);
+        if (!rv) {
+                rv = sscanf(buf, "%20s", modestr);
+                if (!rv)
+                        return -1;
+        }
 
         for (i = 0; tbl[i].modename; i++) {
-                if ((isdigit(*mode_arg) &&
-                     tbl[i].mode == simple_strtol(mode_arg, NULL, 0)) ||
-                    (strcmp(mode_arg, tbl[i].modename) == 0)) {
+                if (mode == tbl[i].mode)
+                        return tbl[i].mode;
+                if (strcmp(modestr, tbl[i].modename) == 0)
                         return tbl[i].mode;
-                }
         }
 
         return -1;