Skip to content

Commit

Permalink
mm/kasan/kasan.c: rename XXX_is_zero to XXX_is_nonzero
Browse files Browse the repository at this point in the history
They return positive value, that is, true, if non-zero value is found.
Rename them to reduce confusion.

Link: http://lkml.kernel.org/r/20170516012350.GA16015@js1304-desktop
Signed-off-by: Joonsoo Kim <[email protected]>
Cc: Andrey Ryabinin <[email protected]>
Cc: Alexander Potapenko <[email protected]>
Cc: Dmitry Vyukov <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
JoonsooKim authored and torvalds committed Jul 10, 2017
1 parent fa69b59 commit f5bd62c
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions mm/kasan/kasan.c
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ static __always_inline bool memory_is_poisoned_16(unsigned long addr)
return *shadow_addr;
}

static __always_inline unsigned long bytes_is_zero(const u8 *start,
static __always_inline unsigned long bytes_is_nonzero(const u8 *start,
size_t size)
{
while (size) {
Expand All @@ -173,19 +173,19 @@ static __always_inline unsigned long bytes_is_zero(const u8 *start,
return 0;
}

static __always_inline unsigned long memory_is_zero(const void *start,
static __always_inline unsigned long memory_is_nonzero(const void *start,
const void *end)
{
unsigned int words;
unsigned long ret;
unsigned int prefix = (unsigned long)start % 8;

if (end - start <= 16)
return bytes_is_zero(start, end - start);
return bytes_is_nonzero(start, end - start);

if (prefix) {
prefix = 8 - prefix;
ret = bytes_is_zero(start, prefix);
ret = bytes_is_nonzero(start, prefix);
if (unlikely(ret))
return ret;
start += prefix;
Expand All @@ -194,20 +194,20 @@ static __always_inline unsigned long memory_is_zero(const void *start,
words = (end - start) / 8;
while (words) {
if (unlikely(*(u64 *)start))
return bytes_is_zero(start, 8);
return bytes_is_nonzero(start, 8);
start += 8;
words--;
}

return bytes_is_zero(start, (end - start) % 8);
return bytes_is_nonzero(start, (end - start) % 8);
}

static __always_inline bool memory_is_poisoned_n(unsigned long addr,
size_t size)
{
unsigned long ret;

ret = memory_is_zero(kasan_mem_to_shadow((void *)addr),
ret = memory_is_nonzero(kasan_mem_to_shadow((void *)addr),
kasan_mem_to_shadow((void *)addr + size - 1) + 1);

if (unlikely(ret)) {
Expand Down

0 comments on commit f5bd62c

Please sign in to comment.