lkml.org 
[lkml]   [2019]   [Jul]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 02/43] perf help: Remove needless use of strncpy()
    Date
    From: Arnaldo Carvalho de Melo <acme@redhat.com>

    commit b6313899f4ed2e76b8375cf8069556f5b94fbff0 upstream.

    Since we make sure the destination buffer has at least strlen(orig) + 1,
    no need to do a strncpy(dest, orig, strlen(orig)), just use strcpy(dest,
    orig).

    This silences this gcc 8.2 warning on Alpine Linux:

    In function 'add_man_viewer',
    inlined from 'perf_help_config' at builtin-help.c:284:3:
    builtin-help.c:192:2: error: 'strncpy' output truncated before terminating nul copying as many bytes from a string as its length [-Werror=stringop-truncation]
    strncpy((*p)->name, name, len);
    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    builtin-help.c: In function 'perf_help_config':
    builtin-help.c:187:15: note: length computed here
    size_t len = strlen(name);
    ^~~~~~~~~~~~

    Cc: Adrian Hunter <adrian.hunter@intel.com>
    Cc: Jiri Olsa <jolsa@kernel.org>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Fixes: 078006012401 ("perf_counter tools: add in basic glue from Git")
    Link: https://lkml.kernel.org/n/tip-2f69l7drca427ob4km8i7kvo@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    tools/perf/builtin-help.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/tools/perf/builtin-help.c
    +++ b/tools/perf/builtin-help.c
    @@ -189,7 +189,7 @@ static void add_man_viewer(const char *n
    while (*p)
    p = &((*p)->next);
    *p = zalloc(sizeof(**p) + len + 1);
    - strncpy((*p)->name, name, len);
    + strcpy((*p)->name, name);
    }

    static int supported_man_viewer(const char *name, size_t len)

    \
     
     \ /
      Last update: 2019-07-02 10:10    [W:4.093 / U:0.140 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site