lkml.org 
[lkml]   [2019]   [Aug]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.2 066/162] can: sja1000: force the string buffer NULL-terminated
    Date
    [ Upstream commit cd28aa2e056cd1ea79fc5f24eed0ce868c6cab5c ]

    strncpy() does not ensure NULL-termination when the input string size
    equals to the destination buffer size IFNAMSIZ. The output string
    'name' is passed to dev_info which relies on NULL-termination.

    Use strlcpy() instead.

    This issue is identified by a Coccinelle script.

    Signed-off-by: Wang Xiayang <xywang.sjtu@sjtu.edu.cn>
    Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/can/sja1000/peak_pcmcia.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/net/can/sja1000/peak_pcmcia.c b/drivers/net/can/sja1000/peak_pcmcia.c
    index 185c7f7d38a4a..5e0d5e8101c86 100644
    --- a/drivers/net/can/sja1000/peak_pcmcia.c
    +++ b/drivers/net/can/sja1000/peak_pcmcia.c
    @@ -479,7 +479,7 @@ static void pcan_free_channels(struct pcan_pccard *card)
    if (!netdev)
    continue;

    - strncpy(name, netdev->name, IFNAMSIZ);
    + strlcpy(name, netdev->name, IFNAMSIZ);

    unregister_sja1000dev(netdev);

    --
    2.20.1


    \
     
     \ /
      Last update: 2019-08-27 10:09    [W:4.150 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site