d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Be even more paranoid about overflow.

Browse Source 
Requested by:	ache
This commit is contained in:
Don Lewis 2014-05-12 20:22:42 +00:00
parent ae866603c7
commit 11e104c50f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=265931
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/kern/subr_rman.c
View File

@ -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;
}