lkml.org 
[lkml]   [2019]   [Nov]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 114/239] soc: qcom: wcnss_ctrl: Avoid string overflow
    Date
    From: Niklas Cassel <niklas.cassel@linaro.org>

    [ Upstream commit 4c96ed170d658d8826d94edec8ac93ee777981a2 ]

    'chinfo.name' is used as a NUL-terminated string, but using strncpy() with
    the length equal to the buffer size may result in lack of the termination:

    drivers//soc/qcom/wcnss_ctrl.c: In function 'qcom_wcnss_open_channel':
    drivers//soc/qcom/wcnss_ctrl.c:284:2: warning: 'strncpy' specified bound 32 equals destination size [-Wstringop-truncation]
    strncpy(chinfo.name, name, sizeof(chinfo.name));
    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

    This changes it to use the safer strscpy() instead.

    Signed-off-by: Niklas Cassel <niklas.cassel@linaro.org>
    Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
    Signed-off-by: Andy Gross <andy.gross@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/soc/qcom/wcnss_ctrl.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/soc/qcom/wcnss_ctrl.c b/drivers/soc/qcom/wcnss_ctrl.c
    index df3ccb30bc2dd..373400dd816d6 100644
    --- a/drivers/soc/qcom/wcnss_ctrl.c
    +++ b/drivers/soc/qcom/wcnss_ctrl.c
    @@ -281,7 +281,7 @@ struct rpmsg_endpoint *qcom_wcnss_open_channel(void *wcnss, const char *name, rp
    struct rpmsg_channel_info chinfo;
    struct wcnss_ctrl *_wcnss = wcnss;

    - strncpy(chinfo.name, name, sizeof(chinfo.name));
    + strscpy(chinfo.name, name, sizeof(chinfo.name));
    chinfo.src = RPMSG_ADDR_ANY;
    chinfo.dst = RPMSG_ADDR_ANY;

    --
    2.20.1


    \
     
     \ /
      Last update: 2019-11-19 06:59    [W:2.800 / U:3.156 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site