head	1.2;
access;
symbols
	pkgsrc-2020Q2:1.1.0.28
	pkgsrc-2020Q2-base:1.1
	pkgsrc-2020Q1:1.1.0.8
	pkgsrc-2020Q1-base:1.1
	pkgsrc-2019Q4:1.1.0.30
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.26
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.24
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.22
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.20
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.18
	pkgsrc-2018Q3-base:1.1
	pkgsrc-2018Q2:1.1.0.16
	pkgsrc-2018Q2-base:1.1
	pkgsrc-2018Q1:1.1.0.14
	pkgsrc-2018Q1-base:1.1
	pkgsrc-2017Q4:1.1.0.12
	pkgsrc-2017Q4-base:1.1
	pkgsrc-2017Q3:1.1.0.10
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.6
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.4
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.2
	pkgsrc-2016Q4-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2020.08.19.10.39.24;	author bouyer;	state dead;
branches;
next	1.1;
commitid	DGAMglRf0Jde6FkC;

1.1
date	2016.11.22.20.55.29;	author bouyer;	state Exp;
branches;
next	;
commitid	stCAOMdiB0Zcqavz;


desc
@@


1.2
log
@Remove xenkernel and xentools packages older than 4.11.
They're not maintained anymore upstream, and don't build on supported NetBSD
releases.
@
text
@$NetBSD: patch-XSA-197-2,v 1.1 2016/11/22 20:55:29 bouyer Exp $

Backported from:

From: Jan Beulich <jbeulich@@suse.com>
Subject: xen: fix ioreq handling

Avoid double fetches and bounds check size to avoid overflowing
internal variables.

This is XSA-197.

Reported-by: yanghongke <yanghongke@@huawei.com>
Signed-off-by: Jan Beulich <jbeulich@@suse.com>
Reviewed-by: Stefano Stabellini <sstabellini@@kernel.org>

--- qemu-xen/xen-all.c.orig	2016-11-22 15:13:15.000000000 +0100
+++ qemu-xen/xen-all.c	2016-11-22 16:19:25.000000000 +0100
@@@@ -661,6 +661,10 @@@@
 
     sign = req->df ? -1 : 1;
 
+    if (req->size > sizeof(uint32_t)) {
+        hw_error("PIO: bad size (%u)", req->size);
+    }
+
     if (req->dir == IOREQ_READ) {
         if (!req->data_is_ptr) {
             req->data = do_inp(req->addr, req->size);
@@@@ -696,6 +700,10 @@@@
 
     sign = req->df ? -1 : 1;
 
+    if (req->size > sizeof(req->data)) {
+        hw_error("MMIO: bad size (%u)", req->size);
+    }
+
     if (!req->data_is_ptr) {
         if (req->dir == IOREQ_READ) {
             for (i = 0; i < req->count; i++) {
@@@@ -783,11 +791,13 @@@@
         req.df = 1;
         req.type = buf_req->type;
         req.data_is_ptr = 0;
+        xen_rmb();
         qw = (req.size == 8);
         if (qw) {
             buf_req = &state->buffered_io_page->buf_ioreq[
                 (state->buffered_io_page->read_pointer + 1) % IOREQ_BUFFER_SLOT_NUM];
             req.data |= ((uint64_t)buf_req->data) << 32;
+            xen_rmb();
         }
 
         handle_ioreq(&req);
@@@@ -819,7 +829,11 @@@@
 
     handle_buffered_iopage(state);
     if (req) {
-        handle_ioreq(req);
+        ioreq_t copy = *req;
+
+        xen_rmb();
+        handle_ioreq(&copy);
+        req->data = copy.data;
 
         if (req->state != STATE_IOREQ_INPROCESS) {
             fprintf(stderr, "Badness in I/O request ... not in service?!: "
@


1.1
log
@Backport upstream patches, fixing today's XSA 191, 192, 195, 197, 198.
Bump PKGREVISIONs
@
text
@d1 1
a1 1
$NetBSD: $
@