Message ID | 20200605102230.21493-12-philmd@redhat.com |
---|---|
State | New |
Headers | show |
Series | hw/sd/sdcard: Fix CVE-2020-13253 & cleanups | expand |
On Fri, 5 Jun 2020 at 11:28, Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > > From: Philippe Mathieu-Daudé <f4bug@amsat.org> > > We don't need to check if sd->blk is set twice. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/sd/sd.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/hw/sd/sd.c b/hw/sd/sd.c > index a1b25ed36f..060ca9d993 100644 > --- a/hw/sd/sd.c > +++ b/hw/sd/sd.c > @@ -2123,12 +2123,12 @@ static void sd_realize(DeviceState *dev, Error **errp) > return; > } > > - if (sd->blk && blk_is_read_only(sd->blk)) { > - error_setg(errp, "Cannot use read-only drive as SD card"); > - return; > - } > - > if (sd->blk) { > + if (blk_is_read_only(sd->blk)) { > + error_setg(errp, "Cannot use read-only drive as SD card"); > + return; > + } > + > ret = blk_set_perm(sd->blk, BLK_PERM_CONSISTENT_READ | BLK_PERM_WRITE, > BLK_PERM_ALL, errp); > if (ret < 0) { Originally written with the pattern of "check all the error cases first; then do actual work". But if you prefer this way around Reviewed-by: Peter Maydell <peter.maydell@linaro.org> thanks -- PMM
diff --git a/hw/sd/sd.c b/hw/sd/sd.c index a1b25ed36f..060ca9d993 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -2123,12 +2123,12 @@ static void sd_realize(DeviceState *dev, Error **errp) return; } - if (sd->blk && blk_is_read_only(sd->blk)) { - error_setg(errp, "Cannot use read-only drive as SD card"); - return; - } - if (sd->blk) { + if (blk_is_read_only(sd->blk)) { + error_setg(errp, "Cannot use read-only drive as SD card"); + return; + } + ret = blk_set_perm(sd->blk, BLK_PERM_CONSISTENT_READ | BLK_PERM_WRITE, BLK_PERM_ALL, errp); if (ret < 0) {