lkml.org 
[lkml]   [2018]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.18 66/76] nds32: fix logic for module
    Date
    From: Greentime Hu <greentime@andestech.com>

    [ Upstream commit 1dfdf99106668679b0de5a62fd4f42c1a11c9445 ]

    This bug is report by Dan Carpenter. We shall use ~loc_mask instead of
    !loc_mask because we need to and(&) the bits of ~loc_mask.

    Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
    Fixes: c9a4a8da6baa ("nds32: Loadable modules")
    Signed-off-by: Greentime Hu <greentime@andestech.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    arch/nds32/kernel/module.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/arch/nds32/kernel/module.c b/arch/nds32/kernel/module.c
    index 4167283d8293..1e31829cbc2a 100644
    --- a/arch/nds32/kernel/module.c
    +++ b/arch/nds32/kernel/module.c
    @@ -40,7 +40,7 @@ void do_reloc16(unsigned int val, unsigned int *loc, unsigned int val_mask,

    tmp2 = tmp & loc_mask;
    if (partial_in_place) {
    - tmp &= (!loc_mask);
    + tmp &= (~loc_mask);
    tmp =
    tmp2 | ((tmp + ((val & val_mask) >> val_shift)) & val_mask);
    } else {
    @@ -70,7 +70,7 @@ void do_reloc32(unsigned int val, unsigned int *loc, unsigned int val_mask,

    tmp2 = tmp & loc_mask;
    if (partial_in_place) {
    - tmp &= (!loc_mask);
    + tmp &= (~loc_mask);
    tmp =
    tmp2 | ((tmp + ((val & val_mask) >> val_shift)) & val_mask);
    } else {
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-09-24 17:01    [W:4.068 / U:1.336 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site