From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.openvz.org (mail.openvz.org [69.168.225.77]) by lore.virtuozzo.com (Postfix) with ESMTPS id 9F2F98045D for ; Thu, 29 Oct 2026 13:00:50 +0000 (UTC) Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 69TCxZO8032660; Thu, 29 Oct 2026 15:59:36 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 69TCxZO8032660 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="XFcyqztE" Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 69TCxRFt032634 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Thu, 29 Oct 2026 15:59:27 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 69TCxRFt032634 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-48c4445512dso1834622f8f.2 for ; Thu, 29 Oct 2026 05:59:27 -0700 (PDT) X-Forwarded-Encrypted: i=2; AKwUvBzqcQjsASjQFNqqC+sXEMtFtGUhyxmpixAInZJ5cdEX7/GftZFaBzXFSjqu6qohtgstqPOGqQ==@openvz.org X-Gm-Message-State: AFq9FYLO0uTDX+BsEBEnegeca/alBgf3Lh4R7KAow1kUJhBp+9VkceXh XbH6faoYZpJaw9/3IT7ERJw4qEsqT7+M8DUoSlZBc6/vdD3ZiWd533Y6A7usy92hAK7T49bt9kp wREm1gyESlZkX7zqxCj1QD8cv44Y7YdfmbgF+o5toEwPNsMy/El2PIw== X-Gm-Gg: AYBFou0FB+l8tAR8PmFPR2dF8Zd54df9glx/AIx7R6Ocwh/kFeRvHCzp0ha4wUWFFYZ Qb5gKEtKraStYSvW2Fd634FqWxig5J+J7zDGJwiqlUE0FP4uIg8fYoAcaWS0mPzbprOHRvQmtvm ypEvx3PI/vhmPxfGnJjmk1K3+9ZyGgA8+kjKNOMy8zE8JnDOCzAUAiODtSjxZJjBE/t7IevLS1+ ezjaJgaUBzJk3HQapbXPLAJqGLbq/xQqm/qCxzV3AUkMpuuCpInrN2j1JxmZpD9NOemb2+UQ3yy 5JJEDpzP0iQ4ELQOLIsCG46z8HHPokgQXhgAcUqRuGFWjZBorT98WqOqe/PpNOAwcNQdoWVIQZu huQf+0a0zygD88XzFAxPOj/Zbz/KI X-Received: by 2002:adf:f70e:0:b0:485:8cc8:1f5f with SMTP id ffacd0b85a97d-48e5d55f7a3mr9706647f8f.42.1793278767063; Thu, 29 Oct 2026 05:59:27 -0700 (PDT) X-Received: by 2002:adf:f70e:0:b0:485:8cc8:1f5f with SMTP id ffacd0b85a97d-48e5d55f7a3mr9706625f8f.42.1793278766560; Thu, 29 Oct 2026 05:59:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1793278766; cv=none; d=google.com; s=arc-20260327; b=YSwHBv6Am0P+onQYr3rqnJAD0ZVCH21OAmQv/Cj75KMox3u/CqQUaE6vRhGMVYqA55 mjwJYYXvkHt4deW58Tfc4n3Wr1o+Y3afUD6rPaChG1qLdslFMr/NpbKfcgpVjU/lkKY1 fJmTgu5K58iI9kz5kDz/Ut5fK2zs844Es5nW17ObrXDr92hsTJY8VA8jzwU1pKG2L0Me fpSurGkG+K2FtM/IrvE76cFu0MWTCljm1ng6yMbhDj/gCNn03piyKuvnFdkoEHaQgLbM JUEnV8C2IiMpu8LAtrHoIxr9Hrd2EGo28Ptix/eS+hc2H7AEkQXhDzIV9mWb5qIQ2dRX 7VDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=4UKNrH5Rqi4Pt4+SvMoSgZh7lX/IMqhadJHDbnnmagM=; fh=CMILZ+goaghq6B4UpCDhf0EQp6kYD0LAlmOkUiVCOvs=; b=GaCzlwzoxYsvCyjlJ1g/ktKZQuljwn3VYirmvo8nktZVB3YGxhggyW8AhrNMIbD15x h1K4alIks4nd80kviVgPxeys4KHlR/qMwikeppagnvtp7G8FbqrcDX6F4iLvRBOe/Cor ODXTHiW4V6x8eVJeRWYVkDVKFdCa8NZDZc+DZSchsNeqiNq3u8Q1eeSy/AEQnWhbLpcc ORv56ACw79GUwdMQ4NHfq36p+a5YCcPgOSf1ZTbPtPIyaYyCkP76cQjFFZfWJXSazZAU iMkULqy4VooYLbq4CtHiNOtUY7mGv7YVUVv5Bl+ppd+kVs9mJwioiQIcyA5a45c5uZa6 o8Hg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=XFcyqztE; spf=pass (google.com: domain of alexander.ivanov@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=alexander.ivanov@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Received: from relay.virtuozzo.com (relay.virtuozzo.com. [130.117.225.111]) by mx.google.com with ESMTPS id ffacd0b85a97d-48e3ed08e3asi42185095f8f.314.2026.10.29.05.59.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Oct 2026 05:59:26 -0700 (PDT) Received-SPF: pass (google.com: domain of alexander.ivanov@virtuozzo.com designates 130.117.225.111 as permitted sender) client-ip=130.117.225.111; Authentication-Results: mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=XFcyqztE; spf=pass (google.com: domain of alexander.ivanov@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=alexander.ivanov@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=MIME-Version:Message-ID:Date:Subject:From: Content-Type; bh=4UKNrH5Rqi4Pt4+SvMoSgZh7lX/IMqhadJHDbnnmagM=; b=XFcyqztEgSbj X+CMMoO7/LK1k/6OhsnoioFokpCqOnfncGxkMLt/cPKBZLnDfSZH/HfncltfJSl5+7c0R7BTQlMPs YxWRs4P3ey7WEZb4AvmZ1MoTXedDGSRDnss3aKUhpHUZTCJaQJ5TQ+0H2ZJp+kbp/CmHwv/kJ6F/k UeZ59sFfwTAtPq8UUUas6RKAT9hjV/Za4teSssUnmVj2fVUBG7blEpUWeewRkahDEIsldVJHhR4in XqPqZqHnek3UaTscZOj8CmiwuWyQHYA/PnudpIUJpbPw2iDRlAbJ6dUOnFJn+bChNuzDuYg7BbK7e 53Gmv3hinnH+lqhKerleUQ==; Received: from ch-vpn.virtuozzo.com ([130.117.225.6] helo=sky) by relay.virtuozzo.com with esmtps (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1xMPfG-005INM-21; Thu, 29 Oct 2026 13:59:24 +0100 From: Alexander Ivanov To: andrey.zhadchenko@virtuozzo.com Date: Thu, 29 Oct 2026 13:59:22 +0100 Message-ID: <20261029125923.3352735-3-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261029125923.3352735-1-alexander.ivanov@virtuozzo.com> References: <20261029125923.3352735-1-alexander.ivanov@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v2 2/3] drivers/vhost/blk: take virtio_blk_outhdr only from the readable part X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org The request header was moved from the whole descriptor chain, so a chain with no readable part had header bytes read from buffers the guest marked device-writable. Those bytes were also trimmed in place from the writable segments, shifting the start of the READ/GET_ID payload taken from them. Take the header only from the readable part. When that part is shorter than struct virtio_blk_outhdr, drop the request and report it through error_ctx, like the other malformed-header paths do. https://virtuozzo.atlassian.net/browse/VSTOR-142755 Fixes: 1629db092dd7 ("drivers/vhost: vhost-blk accelerator for virtio-blk guests") Feature: vhost-blk: in-kernel accelerator for virtio-blk guests Signed-off-by: Alexander Ivanov --- drivers/vhost/blk.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/vhost/blk.c b/drivers/vhost/blk.c index 7234213924d5..94317a5f2cb6 100644 --- a/drivers/vhost/blk.c +++ b/drivers/vhost/blk.c @@ -554,7 +554,12 @@ static void vhost_blk_handle_guest_kick(struct vhost_work *work) break; } - ret = move_iovec(vq->iov, hdr_iovec, sizeof(hdr), in + out, ARRAY_SIZE(hdr_iovec)); + if (iov_length(vq->iov, out) < sizeof(hdr)) { + vhostblk_vq_err(blk, vq, "virtio_blk_hdr (head %d) is missing!", head); + break; + } + + ret = move_iovec(vq->iov, hdr_iovec, sizeof(hdr), out, ARRAY_SIZE(hdr_iovec)); if (ret < 0) { vhostblk_vq_err(blk, vq, "virtio_blk_hdr (head %d) is too split!", head); break; -- 2.53.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel