From patchwork Wed Nov 20 08:53:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 844512 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:8b:b0:382:43a8:7b94 with SMTP id m11csp1596445wrx; Wed, 20 Nov 2024 00:54:11 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCW+e8Bm1ZTJeJFrU0gfsXBUC6WvAcPMROyYDN3DSv4SnI91crdqA+p3eZJcev5yY1yDLzj1Sw==@linaro.org X-Google-Smtp-Source: AGHT+IFaWmoFofBpWBZb3VGOf05G5lvGVtHXGVot5Wu0W3Fg13kUg0G/N4TA2Bq4aLtJuwlDLrYT X-Received: by 2002:a05:620a:46aa:b0:7a9:aba6:d012 with SMTP id af79cd13be357-7b4232a13a9mr235519385a.22.1732092851332; Wed, 20 Nov 2024 00:54:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1732092851; cv=none; d=google.com; s=arc-20240605; b=CcB1eKhUiqqE30Ooky0QMszhjobj6DhDrBt14DKps5VtxmuxaWAEW04FpJxwdRySEY vWcikt19usrScVzPTt+UrOtXB9bB4wX8C8Sys8OxjNNjzQ7DnSdz7uqiT/kSBjczXhzj WuZSKpO/ZmRVqo/lzYxD5s2UXN7pBqEa6k7CrE31ZPc9wMDHiJxSK22T/tx7p+SK4/Mj y8aWonLAnDKwEP97o5Uz4Qta3/+rMT6IkVug0cok/KJJW/WTg8jz2iSpSIr5E1TOCza1 jfzTOfaxLMBlWMgqb2mvhEqfnCMZvESZlJh/rdpHE86TPfTYTEkWGE4AJkEZj6GzWDMK GuwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=iN/AqNy/hKljQubEThCY6fG1Ip1/THaEqT2SsGhQViM=; fh=JRsHzxK01eLxlrW9CdJaXAIZWt4OVEECApBliHEub6o=; b=X/51+uLrWsk1lauf7lq9ss2pvs2En/R+pTDhPHTNFKjrhFNQBN6YMCr7rjpTvJoIxK 3X7pmKfVCdUeqdpnIRXpBFbI70RmwYTd2G3VRlkHzVhzKICqruLwkubyf7bPCo10Gg8+ 0+kpxl2FzRe1OaDNzmpEflLAw0Uf0lDEhSQRqd/lWP7yKU03E9gLnLHI4MMWhVU1xnlP 4CuOy2yYk8ttfUvoNuodX7ZWrQpckGvqlYFbPfVStZkK7XJwSJSqdZC/+lcbuoudCXcb +nR+FMLURbq1ae0ZAVOhW3iBQHyooY50gn4Fp9OZEiUNPgQuW4AvfLYizhXQVryrnx05 P9yA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=g+D6trgU; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7b48529293fsi119933785a.298.2024.11.20.00.54.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Nov 2024 00:54:11 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=g+D6trgU; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tDgSl-00008P-CH; Wed, 20 Nov 2024 03:53:27 -0500 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 1tDgSg-000070-9A for qemu-devel@nongnu.org; Wed, 20 Nov 2024 03:53:22 -0500 Received: from mail-lf1-x134.google.com ([2a00:1450:4864:20::134]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tDgSd-00053H-BC for qemu-devel@nongnu.org; Wed, 20 Nov 2024 03:53:20 -0500 Received: by mail-lf1-x134.google.com with SMTP id 2adb3069b0e04-53c779ef19cso6546185e87.3 for ; Wed, 20 Nov 2024 00:53:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1732092797; x=1732697597; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=iN/AqNy/hKljQubEThCY6fG1Ip1/THaEqT2SsGhQViM=; b=g+D6trgUFFMXJ3XudxFedLF0n6je+FR/19zH/SZD3s4H0BKHuTGFOtujz9L7rLGpRF WxcczAbjiMckweif30xH9fecj7bpuoQbubcmCYUHhjfSJPuvSbQLuPVYmu9ilxP1tUNN 5TXENSJx+LNgCJWb4Lo+Ludd/5A1NY93mc/1FVOAuDyfGoT9FWPC5JdEKnpTt96PQCUo FFljDT55zMpkZpUNru6ZMS4+Wul5qR9C93l2m6UeAnMSPSxYETCH/Z6Z9A1uhr8AiGKK 9EQ8EtUltGBW+VxDQuyFgbtRklrYpKhVy5kl3vaWgL7qMBthY6vEJQYIjZS9hYeQgDr6 bSTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732092797; x=1732697597; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iN/AqNy/hKljQubEThCY6fG1Ip1/THaEqT2SsGhQViM=; b=LZdc16u+xiarZNGpQCcq3mutZdCqvWyxlwB2Cuj/F/bIVot7SoEx0suIWn1WNhzT+X 2fDX954m5zoY6Nu5AXKkFG5V4KerpYQFPMY4DVHTp8hurVda4HHw2lWNI5fAbbUisxFf BZMowshanTebvu2ZBoGZtvmKG/6vNAolBNU0eYTzBsB2FTEuGBiuSpHyGYVUm2oOoz9S qILJW8t+WEBeZ5IcQT50NfK+kVYDxrSXfpjj4CdJ5CpPiYSD7omQ00EXE4YPKzybAJkb bNs0kbb3z9W5yeIFncaLFARdfPXz+Alteyewp12fWl6CO9QMpnBN5I37Q1HrJudY7U7j 2U1A== X-Gm-Message-State: AOJu0YxJrJFmNJApaFDS+a1OUprpr3w645sUBAAJ9fM6YI65ZpygyFyR txma4joiRQqF1u8jPezIhlGpSgZMc20NmtCRfyzuXeug+BxfSCjMm+5+GSPd3DwL6KHFSRfvmN4 V7Mc= X-Received: by 2002:a05:6512:b0b:b0:539:ea49:d163 with SMTP id 2adb3069b0e04-53dc132e21fmr605456e87.21.1732092796868; Wed, 20 Nov 2024 00:53:16 -0800 (PST) Received: from localhost.localdomain ([176.187.208.27]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-433b0139b22sm11956555e9.0.2024.11.20.00.53.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 Nov 2024 00:53:16 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, David Hildenbrand , Halil Pasic , Christian Borntraeger , Eric Farman , Thomas Huth , Jared Rossi , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 2/2] hw/scsi/scsi-disk: Avoid buffer overrun parsing 'loadparam' Date: Wed, 20 Nov 2024 09:53:00 +0100 Message-ID: <20241120085300.49866-3-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241120085300.49866-1-philmd@linaro.org> References: <20241120085300.49866-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::134; envelope-from=philmd@linaro.org; helo=mail-lf1-x134.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Coverity reported a 1 byte overrun in scsi_property_set_loadparm (CID 15657462). Since loadparam[] length is known, simply directly allocate it in the device state. Fixes: 429442e52d ("hw: Add 'loadparm' property to scsi disk devices") Signed-off-by: Philippe Mathieu-Daudé --- hw/scsi/scsi-disk.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index 96a09fe170..f6d6b7c1ea 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -38,6 +38,7 @@ #include "hw/block/block.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" +#include "hw/s390x/ipl/qipl.h" #include "sysemu/dma.h" #include "sysemu/sysemu.h" #include "qemu/cutils.h" @@ -112,7 +113,7 @@ struct SCSIDiskState { char *vendor; char *product; char *device_id; - char *loadparm; /* only for s390x */ + char loadparm[LOADPARM_LEN]; /* only for s390x */ bool tray_open; bool tray_locked; /* @@ -3145,19 +3146,12 @@ static char *scsi_property_get_loadparm(Object *obj, Error **errp) static void scsi_property_set_loadparm(Object *obj, const char *value, Error **errp) { - char *lp_str; - if (object_property_get_int(obj, "bootindex", NULL) < 0) { error_setg(errp, "'loadparm' is only valid for boot devices"); return; } - lp_str = g_malloc0(strlen(value)); - if (!qdev_prop_sanitize_s390x_loadparm(lp_str, value, errp)) { - g_free(lp_str); - return; - } - SCSI_DISK_BASE(obj)->loadparm = lp_str; + qdev_prop_sanitize_s390x_loadparm(SCSI_DISK_BASE(obj)->loadparm, value, errp); } static void scsi_property_add_specifics(DeviceClass *dc)