diff options
| author | truckman <truckman@FreeBSD.org> | 2014-05-19 04:55:53 +0000 |
|---|---|---|
| committer | truckman <truckman@FreeBSD.org> | 2014-05-19 04:55:53 +0000 |
| commit | 1c8483555851c5e16d5a86e95607e9440c414b65 (patch) | |
| tree | a89b70631d27a3c041d4accbb507ab70241dcf09 /sys/kern/subr_rman.c | |
| parent | 0d5a1c60ff59bc95a33849421627fd2d41e814c1 (diff) | |
| download | FreeBSD-src-1c8483555851c5e16d5a86e95607e9440c414b65.zip FreeBSD-src-1c8483555851c5e16d5a86e95607e9440c414b65.tar.gz | |
Be even more paranoid about overflow.
Requested by: ache
Diffstat (limited to 'sys/kern/subr_rman.c')
| -rw-r--r-- | sys/kern/subr_rman.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/kern/subr_rman.c b/sys/kern/subr_rman.c index b53030a..4101c86 100644 --- a/sys/kern/subr_rman.c +++ b/sys/kern/subr_rman.c @@ -466,8 +466,8 @@ rman_reserve_resource_bound(struct rman *rm, u_long start, u_long end, } amask = (1ul << RF_ALIGNMENT(flags)) - 1; - if (start + amask < start) { - DPRINTF(("start+amask wrapped around\n")); + if (start > ULONG_MAX - amask) { + DPRINTF(("start+amask would wrap around\n")); goto out; } @@ -487,8 +487,8 @@ rman_reserve_resource_bound(struct rman *rm, u_long start, u_long end, s->r_start, end)); break; } - if (s->r_start + amask < s->r_start) { - DPRINTF(("s->r_start (%#lx) + amask (%#lx) wrapped\n", + if (s->r_start > ULONG_MAX - amask) { + DPRINTF(("s->r_start (%#lx) + amask (%#lx) too large\n", s->r_start, amask)); break; } |
