MIME-Version: 1.0
References: <20230202064124.22277-1-zyytlz.wz@163.com> <20230213070906-mutt-send-email-mst@kernel.org>
In-Reply-To: <20230213070906-mutt-send-email-mst@kernel.org>
From:   Zheng Hacker <hackerzheng666@gmail.com>
Date:   Tue, 14 Feb 2023 10:36:56 +0800
Message-ID: <CAJedcCxAjsahL1MAjHMfZkOWZD5Rnbq-vgFTvUfFU3zXMUWCaQ@mail.gmail.com>
Subject: Re: [PATCH v2] scsi: virtio_scsi: Fix poential NULL pointer
 dereference in virtscsi_rescan_hotunplug
To:     "Michael S. Tsirkin" <mst@redhat.com>
Cc:     Zheng Wang <zyytlz.wz@163.com>, jasowang@redhat.com,
        pbonzini@redhat.com, stefanha@redhat.com, jejb@linux.ibm.com,
        martin.petersen@oracle.com,
        virtualization@lists.linux-foundation.org,
        linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
        security@kernel.org, alex000young@gmail.com
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Michael S. Tsirkin <mst@redhat.com> =E4=BA=8E2023=E5=B9=B42=E6=9C=8813=E6=
=97=A5=E5=91=A8=E4=B8=80 20:09=E5=86=99=E9=81=93=EF=BC=9A
>
> On Thu, Feb 02, 2023 at 02:41:24PM +0800, Zheng Wang wrote:
> > There is no check about the return value of kmalloc in
> > virtscsi_rescan_hotunplug. Add the check to avoid use
> > of null pointer 'inq_result' in case of the failure
> > of kmalloc.
> >
> > Signed-off-by: Zheng Wang <zyytlz.wz@163.com>
> > ---
>
> I fixed a typo in subject and tweaked the patch a bit

Thanks for your kindness ^^

>
> > v2:
> > - add kfree to avoid memory leak
> > ---
> >  drivers/scsi/virtio_scsi.c | 13 +++++++++++--
> >  1 file changed, 11 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c
> > index d07d24c06b54..a66d8815d738 100644
> > --- a/drivers/scsi/virtio_scsi.c
> > +++ b/drivers/scsi/virtio_scsi.c
> > @@ -330,7 +330,7 @@ static void virtscsi_handle_param_change(struct vir=
tio_scsi *vscsi,
> >       scsi_device_put(sdev);
> >  }
> >
> > -static void virtscsi_rescan_hotunplug(struct virtio_scsi *vscsi)
> > +static int virtscsi_rescan_hotunplug(struct virtio_scsi *vscsi)
> >  {
> >       struct scsi_device *sdev;
> >       struct Scsi_Host *shost =3D virtio_scsi_host(vscsi->vdev);
> > @@ -338,6 +338,11 @@ static void virtscsi_rescan_hotunplug(struct virti=
o_scsi *vscsi)
> >       int result, inquiry_len, inq_result_len =3D 256;
> >       char *inq_result =3D kmalloc(inq_result_len, GFP_KERNEL);
> >
> > +     if (!inq_result) {
> > +             kfree(inq_result);
> > +             return -ENOMEM;
> > +     }
> > +
> >       shost_for_each_device(sdev, shost) {
> >               inquiry_len =3D sdev->inquiry_len ? sdev->inquiry_len : 3=
6;
> >
> > @@ -366,6 +371,7 @@ static void virtscsi_rescan_hotunplug(struct virtio=
_scsi *vscsi)
> >       }
> >
> >       kfree(inq_result);
> > +     return 0;
> >  }
> >
> >  static void virtscsi_handle_event(struct work_struct *work)
> > @@ -374,12 +380,15 @@ static void virtscsi_handle_event(struct work_str=
uct *work)
> >               container_of(work, struct virtio_scsi_event_node, work);
> >       struct virtio_scsi *vscsi =3D event_node->vscsi;
> >       struct virtio_scsi_event *event =3D &event_node->event;
> > +     int ret =3D 0;
> >
>
> dropped =3D 0 here

Get it.

>
> >       if (event->event &
> >           cpu_to_virtio32(vscsi->vdev, VIRTIO_SCSI_T_EVENTS_MISSED)) {
>
> and moved declaration here.

Will do in the next version of patch.
>
> >               event->event &=3D ~cpu_to_virtio32(vscsi->vdev,
> >                                                  VIRTIO_SCSI_T_EVENTS_M=
ISSED);
> > -             virtscsi_rescan_hotunplug(vscsi);
> > +             ret =3D virtscsi_rescan_hotunplug(vscsi);
> > +             if (ret)
> > +                     return;
> >               scsi_scan_host(virtio_scsi_host(vscsi->vdev));
> >       }
> >
> > --
> > 2.25.1
> >
> >
>