From nobody Fri May 17 05:16:10 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1712232166; cv=none; d=zohomail.com; s=zohoarc; b=dx/ISs2YQIXPgVrEx8Y+o8CMPwFj5zyQws0N/olUfXkQ+9LeUln/3q1iKl7iNlxU7VpjqFdW7P0c3f2uBlCgXyE/+hh/OWMt0h5ZP0eYf8bTJlYpFuNr2teT3vkH1eb5AlfCrJ97qbAJycxoR3gipyTwkPTu5mm7UE1wyTNhqxk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712232166; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=GO0ls1hQiObcHd1DBdp8MP2QOtBJ7Bpa+kAIWvDYvC4=; b=NdBo+FvN16kCT/18HijbFQ9GRc7uWBG+QfwDOKHzn7Kw4fP5oGGQ96emvXf59/CB+40Kami+bS86G0upPTFZgIDaZS8k4uGGJ0fKbfOBElLOvGgpJH8JvQooEq3LGHUXWmZkRKiCCfe48LW+fZtG0vrI/N9Tr2ouSdkditoKTW0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1712232166677685.2015119560859; Thu, 4 Apr 2024 05:02:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rsLmj-0004ow-BH; Thu, 04 Apr 2024 08:01:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rsLmd-0004kn-KF; Thu, 04 Apr 2024 08:01:32 -0400 Received: from mail-ed1-x535.google.com ([2a00:1450:4864:20::535]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rsLmb-00063z-J3; Thu, 04 Apr 2024 08:01:31 -0400 Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-56dc9955091so966743a12.1; Thu, 04 Apr 2024 05:01:27 -0700 (PDT) Received: from wing.epfl.ch (dhcp-122-dist-b-021.epfl.ch. [128.178.122.21]) by smtp.gmail.com with ESMTPSA id cf2-20020a0564020b8200b0056b0af78d80sm9268325edb.34.2024.04.04.05.01.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Apr 2024 05:01:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712232084; x=1712836884; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=GO0ls1hQiObcHd1DBdp8MP2QOtBJ7Bpa+kAIWvDYvC4=; b=H/ngHO41KQmCVhGvGkzoFk7L4lk+f9SNxwZ26AecKYflRs1kCoXqLLG2CGogza1HCP 4h9pcmbg1M9XLALiEsNTKf7NKTiuG+LT/9LhrLnjaUfrsd1ghir0Qhs4fBLGjBangvaa jBMzebubTI2TSZ1G5A1ulOfdvfiXOX1aXD6j1mQuPCHA1Tj5SXLLGZ6V+XZ0OgBZ14+i +gDbtyeeFj3isKz0u0bbEp21muX5B93NzXAh+4DP5xOt/VSI/fsgIzv0HrC/AIMRUSmr oQBNy/KBLzbYLnz5MR0tJ7EjkvL+9gd15QxwS3m8pzBnRzj+q7RIUBmjqHy2/oDkBK72 bURQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712232084; x=1712836884; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=GO0ls1hQiObcHd1DBdp8MP2QOtBJ7Bpa+kAIWvDYvC4=; b=F7n3hI0yBfEOzYU1cZl3I796GVgOlrnkpmjxMC3wxHq/b9TmYDn6WPdus+gcSOCe0A SdIm6FV+N9f1qisVXvnKKMtwduITuC0YYVGFHNf7yS6U3KQWh9eFbXUeJIUjGhpfbTRq w7AtldRNGcI6LtCmAe+1wDWHpfssQIJhdmJM+g7OBO1v8miGwhYPwhmAlncOtR0yHIrw rzcZN/OLClrlG3NR3ovO4LxqPVOXpxQXPvFBPRxt+jAgpKobXjvDP19jLCOleTZMEpUT Ag3gT7VmHo9NnQxqdfPrrzi0d2P1/2EMYspzpg0hWpd7WY03Qa9EXum3EQxNzbDvr2r/ W5UA== X-Forwarded-Encrypted: i=1; AJvYcCXbKbmSdBwbNM8P08f7xG8Rr9jDEMaHxil7p1ZGfCQSOf7wsD4JPqu4JcazAxaKTsnYxAe2GSEMlWqH1cgscSdrIQR8vdwfZRscrMULR9OBV74tpO297YwREFxN7Q== X-Gm-Message-State: AOJu0YzSOdv/DFwP7/U7qYIey4VXRCf10zuQRbEB/vlj8AycP2Em1Rkm UTi40sa0/Y6q+A+227skKrN566VjH3oh2eiFgDf/GkE7cKhgj4I= X-Google-Smtp-Source: AGHT+IH9qSK6veOtOWJPKIpSLCR7CLJytg6ApvMHK1xEf0NisgiLxIiqxyJHzZrA9bvXHHCd+UN7Fw== X-Received: by 2002:a50:a6d4:0:b0:567:45e2:c4db with SMTP id f20-20020a50a6d4000000b0056745e2c4dbmr1761556edc.39.1712232083691; Thu, 04 Apr 2024 05:01:23 -0700 (PDT) From: Zheyu Ma To: Stefan Hajnoczi , "Michael S. Tsirkin" , Kevin Wolf , Hanna Reitz Cc: Zheyu Ma , qemu-block@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH] block/virtio-blk: Fix memory leak from virtio_blk_zone_report Date: Thu, 4 Apr 2024 14:00:40 +0200 Message-Id: <20240404120040.1951466-1-zheyuma97@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::535; envelope-from=zheyuma97@gmail.com; helo=mail-ed1-x535.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1712232168762100001 Content-Type: text/plain; charset="utf-8" This modification ensures that in scenarios where the buffer size is insufficient for a zone report, the function will now properly set an error status and proceed to a cleanup label, instead of merely returning. The following ASAN log reveals it: =3D=3D1767400=3D=3DERROR: LeakSanitizer: detected memory leaks Direct leak of 312 byte(s) in 1 object(s) allocated from: #0 0x64ac7b3280cd in malloc llvm/compiler-rt/lib/asan/asan_malloc_linux= .cpp:129:3 #1 0x735b02fb9738 in g_malloc (/lib/x86_64-linux-gnu/libglib-2.0.so.0+0= x5e738) #2 0x64ac7d23be96 in virtqueue_split_pop hw/virtio/virtio.c:1612:12 #3 0x64ac7d23728a in virtqueue_pop hw/virtio/virtio.c:1783:16 #4 0x64ac7cfcaacd in virtio_blk_get_request hw/block/virtio-blk.c:228:27 #5 0x64ac7cfca7c7 in virtio_blk_handle_vq hw/block/virtio-blk.c:1123:23 #6 0x64ac7cfecb95 in virtio_blk_handle_output hw/block/virtio-blk.c:115= 7:5 Signed-off-by: Zheyu Ma --- hw/block/virtio-blk.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index 92de315f17..bb86e65f65 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -768,7 +768,8 @@ static void virtio_blk_handle_zone_report(VirtIOBlockRe= q *req, sizeof(struct virtio_blk_zone_report) + sizeof(struct virtio_blk_zone_descriptor)) { virtio_error(vdev, "in buffer too small for zone report"); - return; + err_status =3D VIRTIO_BLK_S_ZONE_INVALID_CMD; + goto out; } =20 /* start byte offset of the zone report */ --=20 2.34.1