lkml.org 
[lkml]   [2019]   [Jul]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.2 218/413] libbpf: fix GCC8 warning for strncpy
    Date
    [ Upstream commit cdfc7f888c2a355b01308e97c6df108f1c2b64e8 ]

    GCC8 started emitting warning about using strncpy with number of bytes
    exactly equal destination size, which is generally unsafe, as can lead
    to non-zero terminated string being copied. Use IFNAMSIZ - 1 as number
    of bytes to ensure name is always zero-terminated.

    Signed-off-by: Andrii Nakryiko <andriin@fb.com>
    Cc: Magnus Karlsson <magnus.karlsson@intel.com>
    Acked-by: Yonghong Song <yhs@fb.com>
    Acked-by: Magnus Karlsson <magnus.karlsson@intel.com>
    Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/lib/bpf/xsk.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/tools/lib/bpf/xsk.c b/tools/lib/bpf/xsk.c
    index 38667b62f1fe..8a7a05bc657d 100644
    --- a/tools/lib/bpf/xsk.c
    +++ b/tools/lib/bpf/xsk.c
    @@ -337,7 +337,8 @@ static int xsk_get_max_queues(struct xsk_socket *xsk)

    channels.cmd = ETHTOOL_GCHANNELS;
    ifr.ifr_data = (void *)&channels;
    - strncpy(ifr.ifr_name, xsk->ifname, IFNAMSIZ);
    + strncpy(ifr.ifr_name, xsk->ifname, IFNAMSIZ - 1);
    + ifr.ifr_name[IFNAMSIZ - 1] = '\0';
    err = ioctl(fd, SIOCETHTOOL, &ifr);
    if (err && errno != EOPNOTSUPP) {
    ret = -errno;
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-07-24 22:39    [W:3.237 / U:0.464 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site