diff options
| author | Greentime Hu <greentime@andestech.com> | 2018-07-18 09:54:55 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-10 08:55:56 +0200 |
| commit | 2b847f91abb81b8d3c3e2b491288a23767d81c9b (patch) | |
| tree | 8b84a08a49a203b08427d8ae52ace77c776aa6cc | |
| parent | 5bdcac88df0bbe80c636dce61cb211641a4e879c (diff) | |
| download | linux-stable-2b847f91abb81b8d3c3e2b491288a23767d81c9b.tar.gz linux-stable-2b847f91abb81b8d3c3e2b491288a23767d81c9b.tar.bz2 linux-stable-2b847f91abb81b8d3c3e2b491288a23767d81c9b.zip | |
nds32: fix logic for module
[ 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/nds32/kernel/module.c | 4 |
1 files 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 { |