From nobody Sun Nov 9 22:30:56 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551952609914276.7053890201016; Thu, 7 Mar 2019 01:56:49 -0800 (PST) Received: from localhost ([127.0.0.1]:48306 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1ple-0006t8-Tv for importer@patchew.org; Thu, 07 Mar 2019 04:56:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35046) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1pjk-0005aP-TL for qemu-devel@nongnu.org; Thu, 07 Mar 2019 04:54:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1pjk-0007sp-3E for qemu-devel@nongnu.org; Thu, 07 Mar 2019 04:54:48 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34906) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1pjj-0007sB-QS for qemu-devel@nongnu.org; Thu, 07 Mar 2019 04:54:48 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0F0A47EBA7 for ; Thu, 7 Mar 2019 09:54:47 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-211.ams2.redhat.com [10.36.116.211]) by smtp.corp.redhat.com (Postfix) with ESMTP id BE6331001E69; Thu, 7 Mar 2019 09:54:42 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 0C3FC17514; Thu, 7 Mar 2019 10:54:42 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 10:54:40 +0100 Message-Id: <20190307095441.31921-4-kraxel@redhat.com> In-Reply-To: <20190307095441.31921-1-kraxel@redhat.com> References: <20190307095441.31921-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 07 Mar 2019 09:54:47 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 3/4] usb-mtp: prevent null dereference while deleting objects X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bandan Das , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Bandan Das Spotted by Coverity: CID 1399144 Signed-off-by: Bandan Das Message-id: 20190306210409.14842-4-bsd@redhat.com Signed-off-by: Gerd Hoffmann --- hw/usb/dev-mtp.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index 1f22284949df..06e376bcd211 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -1177,9 +1177,7 @@ static int usb_mtp_deletefn(MTPState *s, MTPObject *o= , uint32_t trans) usb_mtp_object_free_one(s, o); success =3D true; } - } - - if (o->format =3D=3D FMT_ASSOCIATION) { + } else if (o->format =3D=3D FMT_ASSOCIATION) { if (rmdir(o->path)) { partial_delete =3D true; } else { --=20 2.18.1