lkml.org 
[lkml]   [2015]   [Mar]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.19 090/123] of: handle both / and : in path strings
    Date
    3.19-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Brian Norris <computersforpeace@gmail.com>

    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@gmail.com>
    Acked-by: Leif Lindholm <leif.lindholm@linaro.org>
    Signed-off-by: Rob Herring <robh@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    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;




    \
     
     \ /
      Last update: 2015-03-24 19:01    [W:4.047 / U:0.292 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site