Blame SOURCES/kvm-softmmu-physmem-Simplify-flatview_write-and-address_.patch

432cb7
From 916423392b46167c6683b0240610bb5a745590da Mon Sep 17 00:00:00 2001
432cb7
From: Jon Maloy <jmaloy@redhat.com>
432cb7
Date: Wed, 13 Apr 2022 14:51:06 -0400
432cb7
Subject: [PATCH 2/3] softmmu/physmem: Simplify flatview_write and
432cb7
 address_space_access_valid
432cb7
MIME-Version: 1.0
432cb7
Content-Type: text/plain; charset=UTF-8
432cb7
Content-Transfer-Encoding: 8bit
432cb7
432cb7
RH-Author: Jon Maloy <jmaloy@redhat.com>
432cb7
RH-MergeRequest: 151: hw/intc/arm_gicv3: Check for !MEMTX_OK instead of MEMTX_ERROR
432cb7
RH-Commit: [2/3] daabe41eefd5c519def592e374fa368e32a680d3 (jmaloy/qemu-kvm)
432cb7
RH-Bugzilla: 1999236
432cb7
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
432cb7
RH-Acked-by: Peter Xu <peterx@redhat.com>
432cb7
432cb7
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1999236
432cb7
Upstream: Merged
432cb7
CVE: CVE-2021-3750
432cb7
432cb7
commit 58e74682baf4e1ad26b064d8c02e5bc99c75c5d9
432cb7
Author: Philippe Mathieu-Daudé <philmd@redhat.com>
432cb7
Date:   Wed Dec 15 19:24:20 2021 +0100
432cb7
432cb7
    softmmu/physmem: Simplify flatview_write and address_space_access_valid
432cb7
432cb7
    Remove unuseful local 'result' variables.
432cb7
432cb7
    Reviewed-by: Peter Xu <peterx@redhat.com>
432cb7
    Reviewed-by: David Hildenbrand <david@redhat.com>
432cb7
    Reviewed-by: Alexander Bulekov <alxndr@bu.edu>
432cb7
    Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
432cb7
    Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
432cb7
    Message-Id: <20211215182421.418374-3-philmd@redhat.com>
432cb7
    Signed-off-by: Thomas Huth <thuth@redhat.com>
432cb7
432cb7
(cherry picked from commit 58e74682baf4e1ad26b064d8c02e5bc99c75c5d9)
432cb7
Signed-off-by: Jon Maloy <jmaloy@redhat.com>
432cb7
---
432cb7
 softmmu/physmem.c | 11 +++--------
432cb7
 1 file changed, 3 insertions(+), 8 deletions(-)
432cb7
432cb7
diff --git a/softmmu/physmem.c b/softmmu/physmem.c
432cb7
index 3524c04c2a..483a31be81 100644
432cb7
--- a/softmmu/physmem.c
432cb7
+++ b/softmmu/physmem.c
432cb7
@@ -2815,14 +2815,11 @@ static MemTxResult flatview_write(FlatView *fv, hwaddr addr, MemTxAttrs attrs,
432cb7
     hwaddr l;
432cb7
     hwaddr addr1;
432cb7
     MemoryRegion *mr;
432cb7
-    MemTxResult result = MEMTX_OK;
432cb7
 
432cb7
     l = len;
432cb7
     mr = flatview_translate(fv, addr, &addr1, &l, true, attrs);
432cb7
-    result = flatview_write_continue(fv, addr, attrs, buf, len,
432cb7
-                                     addr1, l, mr);
432cb7
-
432cb7
-    return result;
432cb7
+    return flatview_write_continue(fv, addr, attrs, buf, len,
432cb7
+                                   addr1, l, mr);
432cb7
 }
432cb7
 
432cb7
 /* Called within RCU critical section.  */
432cb7
@@ -3119,12 +3116,10 @@ bool address_space_access_valid(AddressSpace *as, hwaddr addr,
432cb7
                                 MemTxAttrs attrs)
432cb7
 {
432cb7
     FlatView *fv;
432cb7
-    bool result;
432cb7
 
432cb7
     RCU_READ_LOCK_GUARD();
432cb7
     fv = address_space_to_flatview(as);
432cb7
-    result = flatview_access_valid(fv, addr, len, is_write, attrs);
432cb7
-    return result;
432cb7
+    return flatview_access_valid(fv, addr, len, is_write, attrs);
432cb7
 }
432cb7
 
432cb7
 static hwaddr
432cb7
-- 
432cb7
2.27.0
432cb7