qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: Michael Tokarev <mjt@tls.msk.ru>,
	qemu-devel@nongnu.org, Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-trivial@nongnu.org, Prasad J Pandit <pjp@fedoraproject.org>,
	qemu-stable@nongnu.org
Subject: Re: [PATCH-for-6.0?] mptsas: remove unused MPTSASState.pending (CVE-2021-3392)
Date: Fri, 16 Apr 2021 13:27:56 +0200	[thread overview]
Message-ID: <8c313f51-db0d-c9c0-621d-a9af689b7164@redhat.com> (raw)
In-Reply-To: <20210416102243.1293871-1-mjt@msgid.tls.msk.ru>

On 4/16/21 12:22 PM, Michael Tokarev wrote:
> During previous attempt to fix CVE-2021-3392 it was discovered
> that MPTSASState.pending is actually not used. So instead of
> fixing the prob, just remove the offending code entirely

What problem?

> 
> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
> Cc: Prasad J Pandit <pjp@fedoraproject.org>
> Cc: qemu-stable@nongnu.org
> ---
>  hw/scsi/mptsas.c | 4 ----
>  hw/scsi/mptsas.h | 1 -
>  2 files changed, 5 deletions(-)
> 
> diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c
> index 7416e78706..5abbc742aa 100644
> --- a/hw/scsi/mptsas.c
> +++ b/hw/scsi/mptsas.c
> @@ -257,7 +257,6 @@ static void mptsas_free_request(MPTSASRequest *req)
>          req->sreq->hba_private = NULL;
>          scsi_req_unref(req->sreq);
>          req->sreq = NULL;
> -        QTAILQ_REMOVE(&s->pending, req, next);
>      }
>      qemu_sglist_destroy(&req->qsg);
>      g_free(req);
> @@ -303,7 +302,6 @@ static int mptsas_process_scsi_io_request(MPTSASState *s,
>      }
>  
>      req = g_new0(MPTSASRequest, 1);
> -    QTAILQ_INSERT_TAIL(&s->pending, req, next);
>      req->scsi_io = *scsi_io;
>      req->dev = s;
>  
> @@ -1319,8 +1317,6 @@ static void mptsas_scsi_realize(PCIDevice *dev, Error **errp)
>  
>      s->request_bh = qemu_bh_new(mptsas_fetch_requests, s);
>  
> -    QTAILQ_INIT(&s->pending);
> -
>      scsi_bus_new(&s->bus, sizeof(s->bus), &dev->qdev, &mptsas_scsi_info, NULL);
>  }
>  
> diff --git a/hw/scsi/mptsas.h b/hw/scsi/mptsas.h
> index b85ac1a5fc..c046497db7 100644
> --- a/hw/scsi/mptsas.h
> +++ b/hw/scsi/mptsas.h
> @@ -79,7 +79,6 @@ struct MPTSASState {
>      uint16_t reply_frame_size;
>  
>      SCSIBus bus;
> -    QTAILQ_HEAD(, MPTSASRequest) pending;
>  };
>  
>  void mptsas_fix_scsi_io_endianness(MPIMsgSCSIIORequest *req);
> 



  reply	other threads:[~2021-04-16 11:29 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-16 10:22 [PATCH] mptsas: remove unused MPTSASState.pending (CVE-2021-3392) Michael Tokarev
2021-04-16 11:27 ` Philippe Mathieu-Daudé [this message]
2021-04-16 11:33   ` [PATCH-for-6.0?] " Philippe Mathieu-Daudé
2021-04-18  5:14     ` Philippe Mathieu-Daudé
2021-04-18  5:16       ` Philippe Mathieu-Daudé

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=8c313f51-db0d-c9c0-621d-a9af689b7164@redhat.com \
    --to=philmd@redhat.com \
    --cc=mjt@tls.msk.ru \
    --cc=peter.maydell@linaro.org \
    --cc=pjp@fedoraproject.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-stable@nongnu.org \
    --cc=qemu-trivial@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).