From nobody Mon Feb 9 05:00:12 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1636644690; cv=none; d=zohomail.com; s=zohoarc; b=aJddXRu8GDHN8F5tHY9wBFtnRaX+elY8xZiz1il50rs1Zx8Qj9NSLQmaMI3hIu2qcqrKcNzmgVtn6hGecueyBdjppERq1dXJoZ2nlnwpBEPLscqln8QA8sBqjae50s6xIQJFeyZQc4m3juC2KxzigWcEbwcIT/TjUYBrmxtIiMw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636644690; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=3/dC0datfFAfEhtZSzQzsP+cA00bUiWsUNIpbbWU/QQ=; b=Wpv3DKZwiFjsD6DpQHKzH/4+tdZmzvekXfyqNYH1otlfHuc16kmxd7Vw8Xi/VXfpxc6KMsjQ//6ocjAUHaAtuioMSr0e8dwlezS8KY26XPHCDFUkke3MhQBBVmxuDcbg/0w/3oHz7nHwPkPxksmMy7RxmDweJWl8gLOULSQCJTQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1636644690924845.4398493913333; Thu, 11 Nov 2021 07:31:30 -0800 (PST) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-486-y4JwgQyNNHeiQ6C30vo1qQ-1; Thu, 11 Nov 2021 10:31:28 -0500 Received: by mail-wm1-f69.google.com with SMTP id n16-20020a05600c3b9000b003331973fdbbso2877421wms.0 for ; Thu, 11 Nov 2021 07:31:28 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id g4sm3107610wro.12.2021.11.11.07.31.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Nov 2021 07:31:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636644689; 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; bh=3/dC0datfFAfEhtZSzQzsP+cA00bUiWsUNIpbbWU/QQ=; b=AqWlPaxQH1K3Bak/nuWQRPQslqBUUG17nB/8ReMJ4MMZPRu3EfTYLEzD9lTnJr3jijD7Mq iQNXdCx9OXP31S4y18lIQW7cJ7I2lNbKI6i2n/KKr+h4Kk4Xkmk5i0chxVxNpaoJyqJqWE CRKv5OQfyYbSmmg3j5Ns1GTgrpkOTdk= X-MC-Unique: y4JwgQyNNHeiQ6C30vo1qQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=3/dC0datfFAfEhtZSzQzsP+cA00bUiWsUNIpbbWU/QQ=; b=Mmz7VeCaOggOX8ugBMOA2xM+fVFQVpn+ndxOlozNJzEtArWytSSfXHPtiWGEY369kf tAN3crA6jVmlj9RuyBa7ooRCp1yxRuch+4k63BDMWd4zTgpDoYzwWxXOIkP1Lx7S5XA+ UT8L2LQMdRnSx7G/E3MTxd/FvVynqrVreXPIDCXCaPsKlQ+YvhlC654+CLZLQ4NzcQjj KziNy6D9A/beGoRkl+1CUR11s60Dea2Zs1wTL6VusjFZcb+luJHnATahfF8RbRKt9b5y bwg0OFZJR3CHnQmr1d/orQaCbDqZUxCOm4oEk4hNwdbb7zYNf7juBUOoFDXCKjnPH96o RQ2g== X-Gm-Message-State: AOAM5315/65kreAfkFBIcaZsa0e36am9MmOdbiX30i+aqpobY1lCUQGM Hbzbvpn/frrvgxVmqeYBbgu9m0cZsvE5YfzVtmI8bcSPsuZcq0j/UN6Uz3M0Mj5V8cyDFuoa1nZ fcgzbZIQGoJ9ugA== X-Received: by 2002:a5d:44d1:: with SMTP id z17mr10018069wrr.143.1636644687332; Thu, 11 Nov 2021 07:31:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJxS5+iEPUfuS+qQGC7ULFZtFuiAcjl2Qh5wdXd1tEbginTseyd6Mulod3rQwR+OEu/WJfRGfw== X-Received: by 2002:a5d:44d1:: with SMTP id z17mr10018045wrr.143.1636644687190; Thu, 11 Nov 2021 07:31:27 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Keith Busch , Mauro Matteo Cascella , Klaus Jensen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-stable@nongnu.org, Qiuhao Li Subject: [PATCH-for-6.2] hw/nvme/ctrl: Fix buffer overrun (CVE-2021-3947) Date: Thu, 11 Nov 2021 16:31:25 +0100 Message-Id: <20211111153125.2258176-1-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1636644692454100001 Both 'buf_len' and 'off' arguments are under guest control. Since nvme_c2h() doesn't check out of boundary access, the caller must check for eventual buffer overrun on 'trans_len'. Cc: qemu-stable@nongnu.org Reported-by: Qiuhao Li Fixes: f432fdfa121 ("support changed namespace asynchronous event") Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/nvme/ctrl.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index 6a571d18cfa..634b290e069 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -4072,7 +4072,8 @@ static uint16_t nvme_smart_info(NvmeCtrl *n, uint8_t = rae, uint32_t buf_len, NvmeNamespace *ns; time_t current_ms; =20 - if (off >=3D sizeof(smart)) { + trans_len =3D MIN(sizeof(smart) - off, buf_len); + if (trans_len >=3D sizeof(smart)) { return NVME_INVALID_FIELD | NVME_DNR; } =20 @@ -4094,7 +4095,6 @@ static uint16_t nvme_smart_info(NvmeCtrl *n, uint8_t = rae, uint32_t buf_len, } } =20 - trans_len =3D MIN(sizeof(smart) - off, buf_len); smart.critical_warning =3D n->smart_critical_warning; =20 smart.data_units_read[0] =3D cpu_to_le64(DIV_ROUND_UP(stats.units_read, @@ -4130,12 +4130,12 @@ static uint16_t nvme_fw_log_info(NvmeCtrl *n, uint3= 2_t buf_len, uint64_t off, .afi =3D 0x1, }; =20 - if (off >=3D sizeof(fw_log)) { + trans_len =3D MIN(sizeof(fw_log) - off, buf_len); + if (trans_len >=3D sizeof(fw_log)) { return NVME_INVALID_FIELD | NVME_DNR; } =20 strpadcpy((char *)&fw_log.frs1, sizeof(fw_log.frs1), "1.0", ' '); - trans_len =3D MIN(sizeof(fw_log) - off, buf_len); =20 return nvme_c2h(n, (uint8_t *) &fw_log + off, trans_len, req); } @@ -4146,7 +4146,8 @@ static uint16_t nvme_error_info(NvmeCtrl *n, uint8_t = rae, uint32_t buf_len, uint32_t trans_len; NvmeErrorLog errlog; =20 - if (off >=3D sizeof(errlog)) { + trans_len =3D MIN(sizeof(errlog) - off, buf_len); + if (trans_len >=3D sizeof(trans_len)) { return NVME_INVALID_FIELD | NVME_DNR; } =20 @@ -4155,7 +4156,6 @@ static uint16_t nvme_error_info(NvmeCtrl *n, uint8_t = rae, uint32_t buf_len, } =20 memset(&errlog, 0x0, sizeof(errlog)); - trans_len =3D MIN(sizeof(errlog) - off, buf_len); =20 return nvme_c2h(n, (uint8_t *)&errlog, trans_len, req); } @@ -4168,8 +4168,11 @@ static uint16_t nvme_changed_nslist(NvmeCtrl *n, uin= t8_t rae, uint32_t buf_len, int i =3D 0; uint32_t nsid; =20 - memset(nslist, 0x0, sizeof(nslist)); trans_len =3D MIN(sizeof(nslist) - off, buf_len); + if (trans_len >=3D sizeof(nslist)) { + return NVME_INVALID_FIELD | NVME_DNR; + } + memset(nslist, 0x0, sizeof(nslist)); =20 while ((nsid =3D find_first_bit(n->changed_nsids, NVME_CHANGED_NSID_SI= ZE)) !=3D NVME_CHANGED_NSID_SIZE) { @@ -4209,7 +4212,8 @@ static uint16_t nvme_cmd_effects(NvmeCtrl *n, uint8_t= csi, uint32_t buf_len, const uint32_t *src_iocs =3D NULL; uint32_t trans_len; =20 - if (off >=3D sizeof(log)) { + trans_len =3D MIN(sizeof(log) - off, buf_len); + if (trans_len >=3D sizeof(log)) { trace_pci_nvme_err_invalid_log_page_offset(off, sizeof(log)); return NVME_INVALID_FIELD | NVME_DNR; } @@ -4237,8 +4241,6 @@ static uint16_t nvme_cmd_effects(NvmeCtrl *n, uint8_t= csi, uint32_t buf_len, memcpy(log.iocs, src_iocs, sizeof(log.iocs)); } =20 - trans_len =3D MIN(sizeof(log) - off, buf_len); - return nvme_c2h(n, ((uint8_t *)&log) + off, trans_len, req); } =20 --=20 2.31.1