stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* Patch "lib: add "on"/"off" support to kstrtobool" has been added to the 4.4-stable tree
@ 2016-10-26  8:27 gregkh
  0 siblings, 0 replies; only message in thread
From: gregkh @ 2016-10-26  8:27 UTC (permalink / raw)
  To: keescook, akarwar, akpm, andy.shevchenko, daniel, gregkh,
	heiko.carstens, joe, kvalo, linux, mpe, nishants, schwidefsky,
	sfrench, torvalds
  Cc: stable, stable-commits


This is a note to let you know that I've just added the patch titled

    lib: add "on"/"off" support to kstrtobool

to the 4.4-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     lib-add-on-off-support-to-kstrtobool.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From a81a5a17d44b26521fb1199f8ccf27f4af337a67 Mon Sep 17 00:00:00 2001
From: Kees Cook <keescook@chromium.org>
Date: Thu, 17 Mar 2016 14:22:57 -0700
Subject: lib: add "on"/"off" support to kstrtobool

From: Kees Cook <keescook@chromium.org>

commit a81a5a17d44b26521fb1199f8ccf27f4af337a67 upstream.

Add support for "on" and "off" when converting to boolean.

Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: Amitkumar Karwar <akarwar@marvell.com>
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Joe Perches <joe@perches.com>
Cc: Kalle Valo <kvalo@codeaurora.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Nishant Sarmukadam <nishants@marvell.com>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Steve French <sfrench@samba.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 lib/kstrtox.c |   20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

--- a/lib/kstrtox.c
+++ b/lib/kstrtox.c
@@ -326,9 +326,9 @@ EXPORT_SYMBOL(kstrtos8);
  * @s: input string
  * @res: result
  *
- * This routine returns 0 iff the first character is one of 'Yy1Nn0'.
- * Otherwise it will return -EINVAL.  Value pointed to by res is
- * updated upon finding a match.
+ * This routine returns 0 iff the first character is one of 'Yy1Nn0', or
+ * [oO][NnFf] for "on" and "off". Otherwise it will return -EINVAL.  Value
+ * pointed to by res is updated upon finding a match.
  */
 int kstrtobool(const char *s, bool *res)
 {
@@ -346,6 +346,20 @@ int kstrtobool(const char *s, bool *res)
 	case '0':
 		*res = false;
 		return 0;
+	case 'o':
+	case 'O':
+		switch (s[1]) {
+		case 'n':
+		case 'N':
+			*res = true;
+			return 0;
+		case 'f':
+		case 'F':
+			*res = false;
+			return 0;
+		default:
+			break;
+		}
 	default:
 		break;
 	}


Patches currently in stable-queue which might be from keescook@chromium.org are

queue-4.4/ovl-fix-info-leak-in-ovl_lookup_temp.patch
queue-4.4/lib-update-single-char-callers-of-strtobool.patch
queue-4.4/pstore-ram-use-memcpy_toio-instead-of-memcpy.patch
queue-4.4/pstore-core-drop-cmpxchg-based-updates.patch
queue-4.4/pstore-ramoops-fixup-driver-removal.patch
queue-4.4/lib-add-on-off-support-to-kstrtobool.patch
queue-4.4/pstore-ram-use-memcpy_fromio-to-save-old-buffer.patch
queue-4.4/lib-move-strtobool-to-kstrtobool.patch

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2016-10-26  8:27 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-26  8:27 Patch "lib: add "on"/"off" support to kstrtobool" has been added to the 4.4-stable tree gregkh

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).