redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

misc: mic/scif: fix wrap around tests

Browse source 
Signed integer overflow is undefined.  Also I added a check for
"(offset < 0)" in scif_unregister() because that makes it match the
other conditions and because I didn't want to subtract a negative.

Fixes: ba612aa8b4 ('misc: mic: SCIF memory registration and unregistration')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Dan Carpenter 2015-10-19 14:19:01 +03:00 committed by Greg Kroah-Hartman
parent 269ad6e018
commit 7b64dbf849
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/misc/mic/scif/scif_rma.c
View file

@ -1511,7 +1511,7 @@ off_t scif_register_pinned_pages(scif_epd_t epd,
if ((map_flags & SCIF_MAP_FIXED) && if ((map_flags & SCIF_MAP_FIXED) &&
((ALIGN(offset, PAGE_SIZE) != offset) || ((ALIGN(offset, PAGE_SIZE) != offset) ||
(offset < 0) || (offset < 0) ||
(offset + (off_t)len < offset))) (len > LONG_MAX - offset)))
return -EINVAL; return -EINVAL;
might_sleep(); might_sleep();
@ -1614,7 +1614,7 @@ off_t scif_register(scif_epd_t epd, void *addr, size_t len, off_t offset,
if ((map_flags & SCIF_MAP_FIXED) && if ((map_flags & SCIF_MAP_FIXED) &&
((ALIGN(offset, PAGE_SIZE) != offset) || ((ALIGN(offset, PAGE_SIZE) != offset) ||
(offset < 0) || (offset < 0) ||
(offset + (off_t)len < offset))) (len > LONG_MAX - offset)))
return -EINVAL; return -EINVAL;
/* Unsupported protection requested */ /* Unsupported protection requested */
@ -1732,7 +1732,8 @@ scif_unregister(scif_epd_t epd, off_t offset, size_t len)
/* Offset is not page aligned or offset+len wraps around */ /* Offset is not page aligned or offset+len wraps around */
if ((ALIGN(offset, PAGE_SIZE) != offset) || if ((ALIGN(offset, PAGE_SIZE) != offset) ||
(offset + (off_t)len < offset)) (offset < 0) ||
(len > LONG_MAX - offset))
return -EINVAL; return -EINVAL;
err = scif_verify_epd(ep); err = scif_verify_epd(ep);