Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1213116

[PATCH 1/1] params: don't ignore the rest of cmdline if parse_one() fails

Show all headers | View raw

parse_args() just aborts after it hits an error, so other args
at the same initcall level are simply ignored. This can lead to
other hard-to-understand problems, for example my testing machine
panics during the boot if I pass "locktorture.verbose=true".

Change parse_args() to save the err code for return and continue.

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
---
 kernel/params.c |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/kernel/params.c b/kernel/params.c
index a22d6a7..b21139f 100644
--- a/kernel/params.c
+++ b/kernel/params.c
@@ -223,7 +223,7 @@ char *parse_args(const char *doing,
 		 int (*unknown)(char *param, char *val,
 				const char *doing, void *arg))
 {
-	char *param, *val;
+	char *param, *val, *err = NULL;
 
 	/* Chew leading spaces */
 	args = skip_spaces(args);
@@ -238,7 +238,7 @@ char *parse_args(const char *doing,
 		args = next_arg(args, &param, &val);
 		/* Stop at -- */
 		if (!val && strcmp(param, "--") == 0)
-			return args;
+			return err ?: args;
 		irq_was_disabled = irqs_disabled();
 		ret = parse_one(param, val, doing, params, num,
 				min_level, max_level, arg, unknown);
@@ -247,24 +247,25 @@ char *parse_args(const char *doing,
 				doing, param);
 
 		switch (ret) {
+		case 0:
+			continue;
 		case -ENOENT:
 			pr_err("%s: Unknown parameter `%s'\n", doing, param);
-			return ERR_PTR(ret);
+			break;
 		case -ENOSPC:
 			pr_err("%s: `%s' too large for parameter `%s'\n",
 			       doing, val ?: "", param);
-			return ERR_PTR(ret);
-		case 0:
 			break;
 		default:
 			pr_err("%s: `%s' invalid for parameter `%s'\n",
 			       doing, val ?: "", param);
-			return ERR_PTR(ret);
+			break;
 		}
+
+		err = ERR_PTR(ret);
 	}
 
-	/* All parsed OK. */
-	return NULL;
+	return err;
 }
 
 /* Lazy bastard, eh? */

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 0/8] Add rcu_sync infrastructure to avoid _expedited()  in percpu-rwsem Oleg Nesterov <oleg@redhat.com> - 2015-08-21 19:50 +0200
  [PATCH v2 3/8] rcusync: Add the CONFIG_PROVE_RCU checks Oleg Nesterov <oleg@redhat.com> - 2015-08-21 19:50 +0200
  [PATCH v2 6/8] percpu-rwsem: change it to rely on rss_sync  infrastructure Oleg Nesterov <oleg@redhat.com> - 2015-08-21 19:50 +0200
  [PATCH v2 5/8] percpu-rwsem: make percpu_free_rwsem() after  kzalloc() safe Oleg Nesterov <oleg@redhat.com> - 2015-08-21 19:50 +0200
  [PATCH v2 8/8] percpu-rwsem: cleanup the lockdep annotations in  percpu_down_read() Oleg Nesterov <oleg@redhat.com> - 2015-08-21 19:50 +0200
  [PATCH v2 4/8] rcusync: Introduce rcu_sync_dtor() Oleg Nesterov <oleg@redhat.com> - 2015-08-21 19:50 +0200
  [PATCH v2 7/8] percpu-rwsem: fix the comments outdated by rcu_sync Oleg Nesterov <oleg@redhat.com> - 2015-08-21 19:50 +0200
  [PATCH v2 2/8] rcusync: Introduce struct rcu_sync_ops Oleg Nesterov <oleg@redhat.com> - 2015-08-21 19:50 +0200
  [PATCH v2 1/8] rcu: Create rcu_sync infrastructure Oleg Nesterov <oleg@redhat.com> - 2015-08-21 19:50 +0200
  Re: [PATCH v2 0/8] Add rcu_sync infrastructure to avoid _expedited()  in percpu-rwsem "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2015-08-22 18:40 +0200
    Re: [PATCH v2 0/8] Add rcu_sync infrastructure to avoid  _expedited() in percpu-rwsem Oleg Nesterov <oleg@redhat.com> - 2015-08-24 17:40 +0200
      parse_args() is too unforgivable? Oleg Nesterov <oleg@redhat.com> - 2015-08-24 20:40 +0200
        Re: parse_args() is too unforgivable? Rusty Russell <rusty@rustcorp.com.au> - 2015-08-25 03:40 +0200
          [PATCH 0/1] params: don't ignore the rest of cmdline if  parse_one() fails Oleg Nesterov <oleg@redhat.com> - 2015-08-25 17:30 +0200
            [PATCH 1/1] params: don't ignore the rest of cmdline if  parse_one() fails Oleg Nesterov <oleg@redhat.com> - 2015-08-25 17:30 +0200
              Re: [PATCH 1/1] params: don't ignore the rest of cmdline if parse_one() fails Rusty Russell <rusty@rustcorp.com.au> - 2015-08-26 03:20 +0200
      Re: [PATCH v2 0/8] Add rcu_sync infrastructure to avoid  _expedited() in percpu-rwsem "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2015-08-26 02:30 +0200
        Re: [PATCH v2 0/8] Add rcu_sync infrastructure to avoid  _expedited() in percpu-rwsem Oleg Nesterov <oleg@redhat.com> - 2015-08-26 14:20 +0200
          Re: [PATCH v2 0/8] Add rcu_sync infrastructure to avoid  _expedited() in percpu-rwsem Oleg Nesterov <oleg@redhat.com> - 2015-08-26 15:00 +0200
            Re: [PATCH v2 0/8] Add rcu_sync infrastructure to avoid  _expedited() in percpu-rwsem "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2015-08-26 16:40 +0200

csiph-web