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

Avoid NULL pointer dereferences

Browse Source 
Add back NULL pointer checks accidentally dropped in r364946. We need
to append a NUL character when that happens.
This commit is contained in:
Warner Losh 2020-08-29 09:59:52 +00:00
parent 17c219fd6f
commit 5eade881a8
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=364949
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/kern/subr_bus.c
View File

@ -5499,11 +5499,20 @@ sysctl_devices(SYSCTL_HANDLER_ARGS)
udev->dv_flags = dev->flags;
udev->dv_state = dev->state;
sbuf_new(&sb, udev->dv_fields, sizeof(udev->dv_fields), SBUF_FIXEDLEN);
sbuf_cat(&sb, dev->nameunit);
if (dev->nameunit != NULL)
sbuf_cat(&sb, dev->nameunit);
else
sbuf_putc(&sb, '\0');
sbuf_putc(&sb, '\0');
sbuf_cat(&sb, dev->desc);
if (dev->desc != NULL)
sbuf_cat(&sb, dev->desc);
else
sbuf_putc(&sb, '\0');
sbuf_putc(&sb, '\0');
sbuf_cat(&sb, dev->driver != NULL ? dev->driver->name : '\0');
if (dev->driver != NULL)
sbuf_cat(&sb, dev->driver->name);
else
sbuf_putc(&sb, '\0');
sbuf_putc(&sb, '\0');
bus_child_pnpinfo_sb(dev, &sb);
sbuf_putc(&sb, '\0');