From nobody Fri May 3 05:25:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1624603544; cv=none; d=zohomail.com; s=zohoarc; b=EVajdYyephxgUZ6egx8MI9SvYGp18RfhkZXZ248QEWAZ0mjHXdRNpjyvrlm6qxHmEEG4ssigLC+3BJhtk6h80iNsIoLYLUg3AsNmcSKzJf410crVyzkJwgWm8ZdRddnJTa95pGvzo4JMk+lkGbd8+tYo4EToj60vCWLDzmJBXS0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624603544; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To; bh=dViz5e+lVVEmf0UFlzwNGbarIpZltjnqcKJ8UbE/T+Q=; b=XhfjEk3LPN1ElB9vM4/QrM6s7Fit72eWC7gNZ9sMfdIxn38+VZRfzuAik1Yc9j3O1OIer8MgSSc697Th/y7adiQi1K2/NSyj15YkQ4jQc74Gfykjl8obeZ9euFY1KKpkxIyWPjXUQAeA8hFX3jvtg9vQ7bzeA7/I+aPHBZ94icM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1624603544900292.1431814248193; Thu, 24 Jun 2021 23:45:44 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.147056.270798 (Exim 4.92) (envelope-from ) id 1lwfaj-0003Xm-PR; Fri, 25 Jun 2021 06:45:29 +0000 Received: by outflank-mailman (output) from mailman id 147056.270798; Fri, 25 Jun 2021 06:45:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lwfaj-0003Xf-MO; Fri, 25 Jun 2021 06:45:29 +0000 Received: by outflank-mailman (input) for mailman id 147056; Fri, 25 Jun 2021 06:45:28 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lwfai-0003XJ-7v for xen-devel@lists.xenproject.org; Fri, 25 Jun 2021 06:45:28 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lwfah-0004HU-6i; Fri, 25 Jun 2021 06:45:27 +0000 Received: from 54-240-197-235.amazon.com ([54.240.197.235] helo=ufe34d9ed68d054.ant.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lwfag-0005fZ-Th; Fri, 25 Jun 2021 06:45:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Message-Id:Date:Subject:Cc:To:From; bh=dViz5e+lVVEmf0UFlzwNGbarIpZltjnqcKJ8UbE/T+Q=; b=x++TpBpP/R1rEm4Ycr/imAuuW5 wLwXKqGPSDBAOAvkTTxx8z/vPWXwgTEMQUgS5aLO4oV9gq5ZD1kubB9vhRxWM4s93P2t0skJwU8QI /Ikc1j5lOZ2uA+dTEXyOe+staFwP/tfIR1+rFywVGnBDWRG90O68mzza89sOtD56EXcc=; From: Julien Grall To: xen-devel@lists.xenproject.org Cc: raphning@amazon.co.uk, doebel@amazon.de, Julien Grall , Ian Jackson , Wei Liu , Juergen Gross , Julien Grall Subject: [PATCH] tools/xenstored: Correctly read the requests header from the stream Date: Fri, 25 Jun 2021 07:45:22 +0100 Message-Id: <20210625064522.24919-1-julien@xen.org> X-Mailer: git-send-email 2.17.1 X-ZohoMail-DKIM: pass (identity @xen.org) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Julien Grall Commit c0fe360f42 ("tools/xenstored: Extend restore code to handle multiple input buffer") extend the read_buffered_state() to support multiple input buffers. Unfortunately, the commit didn't go far enough and still used sc->data (start of the buffers) for retrieving the header. This would lead to read the wrong headers for second and follow-up commands. Use data in place for sc->data for the source of the memcpy()s. Fixes: c0fe360f42 ("tools/xenstored: Extend restore code to handle multiple= input buffer") Reported-by: Raphael Ning Signed-off-by: Julien Grall Reviewed-by: Juergen Gross ---- I unfortunately didn't spot the issue because I forgot to check whether the REQ ID of the responses were unique. --- tools/xenstore/xenstored_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_cor= e.c index cf7297a96cb1..16c856730c55 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -2717,11 +2717,11 @@ void read_state_buffered_data(const void *ctx, stru= ct connection *conn, len =3D sc->data_in_len - (data - sc->data); if (len < sizeof(bdata->hdr)) { bdata->inhdr =3D true; - memcpy(&bdata->hdr, sc->data, len); + memcpy(&bdata->hdr, data, len); bdata->used =3D len; } else { bdata->inhdr =3D false; - memcpy(&bdata->hdr, sc->data, sizeof(bdata->hdr)); + memcpy(&bdata->hdr, data, sizeof(bdata->hdr)); if (bdata->hdr.msg.len <=3D DEFAULT_BUFFER_SIZE) bdata->buffer =3D bdata->default_buffer; else --=20 2.17.1