upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

vt/ofwfb: Check that /chosen/stdout is valid before using it in initialization

Browse source 
The FDT implementation of OF_instance_to_package() backend checks the
cross-reference to get the node.  On failure, this returns the input handle
unchanged.  In the case of ofwfb attachment, if /chosen/stdout property does not
exist, sc->sc_handle is either garbage or 0, which then gets propagated to node.
This will prevent "screen" from being used, resulting in not properly attaching.
Correct this by matching the code in ofwfb_probe().
This commit is contained in:
Justin Hibbits 2018-07-20 16:08:14 +00:00
parent 9b0841ae45
commit 2cc27fc069
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sys/dev/vt/hw/ofwfb/ofwfb.c
View file

@ -370,9 +370,11 @@ ofwfb_init(struct vt_device *vd)
/* Initialize softc */
vd->vd_softc = sc = &ofwfb_conssoftc;
node = -1;
chosen = OF_finddevice("/chosen");
OF_getprop(chosen, "stdout", &sc->sc_handle, sizeof(ihandle_t));
node = OF_instance_to_package(sc->sc_handle);
if (OF_getprop(chosen, "stdout", &sc->sc_handle,
sizeof(ihandle_t)) == sizeof(ihandle_t))
node = OF_instance_to_package(sc->sc_handle);
if (node == -1) {
/*
* The "/chosen/stdout" does not exist try