upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-04-29 18:32:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

loader: possible NULL pointer dereference in bcache.c

Browse source 
Coverity detected the possible NULL pointer dereference case.
Also updated comment as was suggested in illumos review.

CID:		1371008
Reported by:	Coverity
Reviewed by:	allanjude
Approved by:	allanjude (mentor)
Differential Revision:	https://reviews.freebsd.org/D9496
This commit is contained in:
Toomas Soome 2017-02-08 18:32:53 +00:00
parent 3ff519254c
commit 6db947347c
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sys/boot/common/bcache.c
View file

@ -224,13 +224,13 @@ read_strategy(void *devdata, int rw, daddr_t blk, size_t size,
caddr_t p_buf;
uint32_t *marker;
marker = (uint32_t *)(bc->bcache_data + bc->bcache_nblks * bcache_blksize);
if (bc == NULL) {
errno = ENODEV;
return (-1);
}
marker = (uint32_t *)(bc->bcache_data + bc->bcache_nblks * bcache_blksize);
if (rsize != NULL)
*rsize = 0;
@ -290,10 +290,9 @@ read_strategy(void *devdata, int rw, daddr_t blk, size_t size,
* And secondly, this way we get the most conservative setup for the ra.
*
* The selection of multiple of 16 blocks (8KB) is quite arbitrary, however,
* we want to have the CD (2K) and the 4K disks to be covered.
* Also, as we have 32 blocks to be allocated as the fallback value in the
* bcache_allocate(), the 16 ra blocks will allow the read ahead
* to be used even with bcache this small.
* we want to cover CDs (2K) and 4K disks.
* bcache_allocate() will always fall back to a minimum of 32 blocks.
* Our choice of 16 read ahead blocks will always fit inside the bcache.
*/
ra = bc->bcache_nblks - BHASH(bc, p_blk + p_size);