This is a note to let you know that I've just added the patch titled
of: handle both '/' and ':' in path strings
to the 3.19-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:
of-handle-both-and-in-path-strings.patch
and it can be found in the queue-3.19 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 721a09e95c786346b4188863a1cfa3909c76f690 Mon Sep 17 00:00:00 2001
From: Brian Norris <computersforpeace@xxxxxxxxx>
Date: Tue, 17 Mar 2015 12:30:31 -0700
Subject: of: handle both '/' and ':' in path strings
From: Brian Norris <computersforpeace@xxxxxxxxx>
commit 721a09e95c786346b4188863a1cfa3909c76f690 upstream.
Commit 106937e8ccdc ("of: fix handling of '/' in options for
of_find_node_by_path()") caused a regression in OF handling of
stdout-path. While it fixes some cases which have '/' after the ':', it
breaks cases where there is more than one '/' *before* the ':'.
For example, it breaks this boot string
stdout-path = "/rdb/serial@f040ab00:115200";
So rather than doing sequentialized checks (first for '/', then for ':';
or vice versa), to get the correct behavior we need to check for the
first occurrence of either one of them.
It so happens that the handy strcspn() helper can do just that.
Fixes: 106937e8ccdc ("of: fix handling of '/' in options for of_find_node_by_path()")
Signed-off-by: Brian Norris <computersforpeace@xxxxxxxxx>
Acked-by: Leif Lindholm <leif.lindholm@xxxxxxxxxx>
Signed-off-by: Rob Herring <robh@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/of/base.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -715,13 +715,8 @@ static struct device_node *__of_find_nod
{
struct device_node *child;
int len;
- const char *end;
- end = strchr(path, ':');
- if (!end)
- end = strchrnul(path, '/');
-
- len = end - path;
+ len = strcspn(path, "/:");
if (!len)
return NULL;
Patches currently in stable-queue which might be from computersforpeace@xxxxxxxxx are
queue-3.19/of-handle-both-and-in-path-strings.patch
queue-3.19/mtd-nand-pxa3xx-fix-pio-fifo-draining.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html