lkml.org 
[lkml]   [2018]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.9 014/281] bna: Avoid reading past end of buffer
    Date
    From: Kees Cook <keescook@chromium.org>

    [ Upstream commit 9e4eb1ce472fbf7b007f23c88ec11c37265e401c ]

    Using memcpy() from a string that is shorter than the length copied means
    the destination buffer is being filled with arbitrary data from the kernel
    rodata segment. Instead, use strncpy() which will fill the trailing bytes
    with zeros.

    This was found with the future CONFIG_FORTIFY_SOURCE feature.

    Cc: Daniel Micay <danielmicay@gmail.com>
    Signed-off-by: Kees Cook <keescook@chromium.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    drivers/net/ethernet/brocade/bna/bfa_ioc.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/brocade/bna/bfa_ioc.c b/drivers/net/ethernet/brocade/bna/bfa_ioc.c
    index 0f6811860ad5..a36e38676640 100644
    --- a/drivers/net/ethernet/brocade/bna/bfa_ioc.c
    +++ b/drivers/net/ethernet/brocade/bna/bfa_ioc.c
    @@ -2845,7 +2845,7 @@ bfa_ioc_get_adapter_optrom_ver(struct bfa_ioc *ioc, char *optrom_ver)
    static void
    bfa_ioc_get_adapter_manufacturer(struct bfa_ioc *ioc, char *manufacturer)
    {
    - memcpy(manufacturer, BFA_MFG_NAME, BFA_ADAPTER_MFG_NAME_LEN);
    + strncpy(manufacturer, BFA_MFG_NAME, BFA_ADAPTER_MFG_NAME_LEN);
    }

    static void
    --
    2.14.1
    \
     
     \ /
      Last update: 2018-03-19 22:49    [W:4.415 / U:0.940 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site