From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 07FCDC433B4 for ; Fri, 16 Apr 2021 11:29:15 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 723D8610F7 for ; Fri, 16 Apr 2021 11:29:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 723D8610F7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:43550 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXMev-0001HC-EA for qemu-devel@archiver.kernel.org; Fri, 16 Apr 2021 07:29:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35954) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXMds-0000a2-Cw for qemu-devel@nongnu.org; Fri, 16 Apr 2021 07:28:08 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:55735) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXMdo-0007i9-50 for qemu-devel@nongnu.org; Fri, 16 Apr 2021 07:28:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618572481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ELTAsvqWtIwBFoV4R0MTAcs0uowJXmAEhH4PwIXzgZ4=; b=h7/wp0offa8yxu7FMRwHCuhR/MwY8fomgOrrLsBZqLpoeCOCQnaeZC6fysnpiB+kEl+LB/ suFUNByFV/ZoNEo1Gx44TZVgF5nfCwpPAJVYNLPK55QOiLa2x39i7LlutLyuOyhPZBuw+I zUzbs3asHaJzEbyemNNMd488tcDoPbk= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-40-Do4-9bC_NPOJ8h8Bp6vkTw-1; Fri, 16 Apr 2021 07:27:59 -0400 X-MC-Unique: Do4-9bC_NPOJ8h8Bp6vkTw-1 Received: by mail-wr1-f72.google.com with SMTP id s7-20020adfc5470000b0290106eef17cbdso906517wrf.11 for ; Fri, 16 Apr 2021 04:27:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=ELTAsvqWtIwBFoV4R0MTAcs0uowJXmAEhH4PwIXzgZ4=; b=lqopj2Ew3p/Yw75QxXTQ9efJhqx/78sZCyOqlVdVxMVUrBZLwZUX+dvgKactjlyeoq szwd964bPujPU0gThGLTx5dwL723gRPezgQkuBLEW+AHXHMiONhNpI0GJsOUYZGpFDoY 2u+71rvN+nnstpyEtAUGVJv30FY1/8Kugv8Zio41xHDgSenE/ZTJubpjIQXg//YrTn7c lFsI20sy3ZOeUmfNBT50bpUsrAIEdyRH12k/Rb1l/Oj49H+ksgFjG4Ief8lubQqogRzr D4I52fPl9UR8j9aBGfigMhzqbda17r+ZwCQt2UgRURAVpwBXizDxfMj6T/stEPizC2UQ k1mg== X-Gm-Message-State: AOAM532YchiRClG4uByd1lKrXlZc2dleoW61xUxvVAVY0QVUfwC8/Ux8 4Vi6YEJSg1xF1IDHlKfervTccn+TWc+Z/7rsFkG0f7N7ZbpP47U4Nq5BrhQKLVtPwZqwYwE7nMp cX8uLjk6gERM9quo= X-Received: by 2002:a5d:4912:: with SMTP id x18mr8943715wrq.198.1618572478087; Fri, 16 Apr 2021 04:27:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzbdcXKCBMmVlyUtg+k9RKabHYE6LQzINByCuqo6ZID4tWjpPvffUbgsVbkG9tzP+m/+MWoTA== X-Received: by 2002:a5d:4912:: with SMTP id x18mr8943700wrq.198.1618572477926; Fri, 16 Apr 2021 04:27:57 -0700 (PDT) Received: from [192.168.1.36] (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id j12sm9667340wro.29.2021.04.16.04.27.57 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 16 Apr 2021 04:27:57 -0700 (PDT) Subject: Re: [PATCH-for-6.0?] mptsas: remove unused MPTSASState.pending (CVE-2021-3392) To: Michael Tokarev , qemu-devel@nongnu.org, Peter Maydell References: <20210416102243.1293871-1-mjt@msgid.tls.msk.ru> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Message-ID: <8c313f51-db0d-c9c0-621d-a9af689b7164@redhat.com> Date: Fri, 16 Apr 2021 13:27:56 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: <20210416102243.1293871-1-mjt@msgid.tls.msk.ru> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Prasad J Pandit , qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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 > Cc: Prasad J Pandit > 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); >