From: Keir Fraser Subject: Re: [PATCH] tools/ocaml: oxenstored: correctly handle a full ring. Date: Fri, 15 Feb 2013 09:02:19 +0000 Message-ID: References: <1360917669.25448.6.camel@zakaz.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1360917669.25448.6.camel@zakaz.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Ian Campbell , "xen-devel@lists.xen.org" Cc: Ian Jackson , Tim Deegan , Jon Ludlam List-Id: xen-devel@lists.xenproject.org Who are you looking for an Ack from? The patch makes pefect sense to me so you can have mine if you want it. Acked-by: Keir Fraser On 15/02/2013 08:41, "Ian Campbell" wrote: > Can I get an ACK or NACK for this please, we really should update XSA-38 > ASAP... > > On Wed, 2013-02-13 at 09:43 +0000, Ian Campbell wrote: >> Change 26521:2c0fd406f02c (part of XSA-38 / CVE-2013-0215) incorrectly >> caused us to ignore rather than process a completely full ring. Check if >> producer and consumer are equal before masking to avoid this, since prod == >> cons + PAGE_SIZE after masking becomes prod == cons. >> >> Signed-off-by: Ian Campbell >> --- >> tools/ocaml/libs/xb/xs_ring_stubs.c | 4 ++-- >> 1 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/tools/ocaml/libs/xb/xs_ring_stubs.c >> b/tools/ocaml/libs/xb/xs_ring_stubs.c >> index 4888ac5..fdd9983 100644 >> --- a/tools/ocaml/libs/xb/xs_ring_stubs.c >> +++ b/tools/ocaml/libs/xb/xs_ring_stubs.c >> @@ -45,10 +45,10 @@ static int xs_ring_read(struct mmap_interface *interface, >> cons = *(volatile uint32*)&intf->req_cons; >> prod = *(volatile uint32*)&intf->req_prod; >> xen_mb(); >> - cons = MASK_XENSTORE_IDX(cons); >> - prod = MASK_XENSTORE_IDX(prod); >> if (prod == cons) >> return 0; >> + cons = MASK_XENSTORE_IDX(cons); >> + prod = MASK_XENSTORE_IDX(prod); >> if (prod > cons) >> to_read = prod - cons; >> else > > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel