1*4882a593SmuzhiyunFrom 58e74682baf4e1ad26b064d8c02e5bc99c75c5d9 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: =?utf8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com> 3*4882a593SmuzhiyunDate: Wed, 15 Dec 2021 19:24:20 +0100 4*4882a593SmuzhiyunSubject: [PATCH] softmmu/physmem: Simplify flatview_write and 5*4882a593Smuzhiyun address_space_access_valid 6*4882a593SmuzhiyunMIME-Version: 1.0 7*4882a593SmuzhiyunContent-Type: text/plain; charset=utf8 8*4882a593SmuzhiyunContent-Transfer-Encoding: 8bit 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunRemove unuseful local 'result' variables. 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunReviewed-by: Peter Xu <peterx@redhat.com> 13*4882a593SmuzhiyunReviewed-by: David Hildenbrand <david@redhat.com> 14*4882a593SmuzhiyunReviewed-by: Alexander Bulekov <alxndr@bu.edu> 15*4882a593SmuzhiyunReviewed-by: Stefan Hajnoczi <stefanha@redhat.com> 16*4882a593SmuzhiyunSigned-off-by: Philippe Mathieu-DaudÃf© <philmd@redhat.com> 17*4882a593SmuzhiyunMessage-Id: <20211215182421.418374-3-philmd@redhat.com> 18*4882a593SmuzhiyunSigned-off-by: Thomas Huth <thuth@redhat.com> 19*4882a593SmuzhiyunSigned-off-by: Virendra Thakur <virendra.thakur@kpit.com> 20*4882a593Smuzhiyun 21*4882a593SmuzhiyunCVE: CVE-2021-3750 22*4882a593Smuzhiyun 23*4882a593SmuzhiyunUpstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commit;h=58e74682baf4e1ad26b064d8c02e5bc99c75c5d9] 24*4882a593Smuzhiyun--- 25*4882a593Smuzhiyun softmmu/physmem.c | 11 +++-------- 26*4882a593Smuzhiyun 1 file changed, 3 insertions(+), 8 deletions(-) 27*4882a593Smuzhiyun 28*4882a593Smuzhiyundiff --git a/softmmu/physmem.c b/softmmu/physmem.c 29*4882a593Smuzhiyunindex 43ae70f..3d968ca 100644 30*4882a593Smuzhiyun--- a/softmmu/physmem.c 31*4882a593Smuzhiyun+++ b/softmmu/physmem.c 32*4882a593Smuzhiyun@@ -2826,14 +2826,11 @@ static MemTxResult flatview_write(FlatVi 33*4882a593Smuzhiyun hwaddr l; 34*4882a593Smuzhiyun hwaddr addr1; 35*4882a593Smuzhiyun MemoryRegion *mr; 36*4882a593Smuzhiyun- MemTxResult result = MEMTX_OK; 37*4882a593Smuzhiyun 38*4882a593Smuzhiyun l = len; 39*4882a593Smuzhiyun mr = flatview_translate(fv, addr, &addr1, &l, true, attrs); 40*4882a593Smuzhiyun- result = flatview_write_continue(fv, addr, attrs, buf, len, 41*4882a593Smuzhiyun- addr1, l, mr); 42*4882a593Smuzhiyun- 43*4882a593Smuzhiyun- return result; 44*4882a593Smuzhiyun+ return flatview_write_continue(fv, addr, attrs, buf, len, 45*4882a593Smuzhiyun+ addr1, l, mr); 46*4882a593Smuzhiyun } 47*4882a593Smuzhiyun 48*4882a593Smuzhiyun /* Called within RCU critical section. */ 49*4882a593Smuzhiyun@@ -3130,12 +3127,10 @@ bool address_space_access_valid(AddressS 50*4882a593Smuzhiyun MemTxAttrs attrs) 51*4882a593Smuzhiyun { 52*4882a593Smuzhiyun FlatView *fv; 53*4882a593Smuzhiyun- bool result; 54*4882a593Smuzhiyun 55*4882a593Smuzhiyun RCU_READ_LOCK_GUARD(); 56*4882a593Smuzhiyun fv = address_space_to_flatview(as); 57*4882a593Smuzhiyun- result = flatview_access_valid(fv, addr, len, is_write, attrs); 58*4882a593Smuzhiyun- return result; 59*4882a593Smuzhiyun+ return flatview_access_valid(fv, addr, len, is_write, attrs); 60*4882a593Smuzhiyun } 61*4882a593Smuzhiyun 62*4882a593Smuzhiyun static hwaddr 63*4882a593Smuzhiyun-- 64*4882a593Smuzhiyun1.8.3.1 65*4882a593Smuzhiyun 66