Skip to content

Commit

Permalink
dma-debug: use memory_intersects() directly
Browse files Browse the repository at this point in the history
There is already a memory_intersects() helper in sections.h,
use memory_intersects() directly instead of private overlap().

Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
  • Loading branch information
Kefeng Wang authored and Christoph Hellwig committed Aug 9, 2021
1 parent 36a21d5 commit 1d7db83
Showing 1 changed file with 2 additions and 12 deletions.
14 changes: 2 additions & 12 deletions kernel/dma/debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -1064,20 +1064,10 @@ static void check_for_stack(struct device *dev,
}
}

static inline bool overlap(void *addr, unsigned long len, void *start, void *end)
{
unsigned long a1 = (unsigned long)addr;
unsigned long b1 = a1 + len;
unsigned long a2 = (unsigned long)start;
unsigned long b2 = (unsigned long)end;

return !(b1 <= a2 || a1 >= b2);
}

static void check_for_illegal_area(struct device *dev, void *addr, unsigned long len)
{
if (overlap(addr, len, _stext, _etext) ||
overlap(addr, len, __start_rodata, __end_rodata))
if (memory_intersects(_stext, _etext, addr, len) ||
memory_intersects(__start_rodata, __end_rodata, addr, len))
err_printk(dev, NULL, "device driver maps memory from kernel text or rodata [addr=%p] [len=%lu]\n", addr, len);
}

Expand Down

0 comments on commit 1d7db83

Please sign in to comment.