From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org,
Stefano Stabellini <stefano.stabellini@xilinx.com>,
Julien Grall <jgrall@amazon.com>, Juergen Gross <jgross@suse.com>
Subject: [PATCH 5.11 05/12] xen/arm: dont ignore return errors from set_phys_to_machine
Date: Mon, 22 Feb 2021 13:12:57 +0100 [thread overview]
Message-ID: <20210222121018.164280405@linuxfoundation.org> (raw)
In-Reply-To: <20210222121013.586597942@linuxfoundation.org>
From: Stefano Stabellini <stefano.stabellini@xilinx.com>
commit 36bf1dfb8b266e089afa9b7b984217f17027bf35 upstream.
set_phys_to_machine can fail due to lack of memory, see the kzalloc call
in arch/arm/xen/p2m.c:__set_phys_to_machine_multi.
Don't ignore the potential return error in set_foreign_p2m_mapping,
returning it to the caller instead.
This is part of XSA-361.
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
Cc: stable@vger.kernel.org
Reviewed-by: Julien Grall <jgrall@amazon.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
arch/arm/xen/p2m.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- a/arch/arm/xen/p2m.c
+++ b/arch/arm/xen/p2m.c
@@ -95,8 +95,10 @@ int set_foreign_p2m_mapping(struct gntta
for (i = 0; i < count; i++) {
if (map_ops[i].status)
continue;
- set_phys_to_machine(map_ops[i].host_addr >> XEN_PAGE_SHIFT,
- map_ops[i].dev_bus_addr >> XEN_PAGE_SHIFT);
+ if (unlikely(!set_phys_to_machine(map_ops[i].host_addr >> XEN_PAGE_SHIFT,
+ map_ops[i].dev_bus_addr >> XEN_PAGE_SHIFT))) {
+ return -ENOMEM;
+ }
}
return 0;
next prev parent reply other threads:[~2021-02-22 12:18 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-22 12:12 [PATCH 5.11 00/12] 5.11.1-rc1 review Greg Kroah-Hartman
2021-02-22 12:12 ` [PATCH 5.11 01/12] Xen/x86: dont bail early from clear_foreign_p2m_mapping() Greg Kroah-Hartman
2021-02-22 12:12 ` [PATCH 5.11 02/12] Xen/x86: also check kernel mapping in set_foreign_p2m_mapping() Greg Kroah-Hartman
2021-02-22 12:12 ` [PATCH 5.11 03/12] Xen/gntdev: correct dev_bus_addr handling in gntdev_map_grant_pages() Greg Kroah-Hartman
2021-02-22 12:12 ` [PATCH 5.11 04/12] Xen/gntdev: correct error checking " Greg Kroah-Hartman
2021-02-22 12:12 ` Greg Kroah-Hartman [this message]
2021-02-22 12:12 ` [PATCH 5.11 06/12] xen-blkback: dont "handle" error by BUG() Greg Kroah-Hartman
2021-02-22 12:12 ` [PATCH 5.11 07/12] xen-netback: " Greg Kroah-Hartman
2021-02-22 12:13 ` [PATCH 5.11 08/12] xen-scsiback: " Greg Kroah-Hartman
2021-02-22 12:13 ` [PATCH 5.11 09/12] xen-blkback: fix error handling in xen_blkbk_map() Greg Kroah-Hartman
2021-02-22 12:13 ` [PATCH 5.11 10/12] tty: protect tty_write from odd low-level tty disciplines Greg Kroah-Hartman
2021-02-22 12:13 ` [PATCH 5.11 11/12] Bluetooth: btusb: Always fallback to alt 1 for WBS Greg Kroah-Hartman
2021-02-22 12:13 ` [PATCH 5.11 12/12] media: pwc: Use correct device for DMA Greg Kroah-Hartman
2021-02-22 19:40 ` [PATCH 5.11 00/12] 5.11.1-rc1 review Naresh Kamboju
2021-02-23 12:57 ` Greg Kroah-Hartman
2021-02-22 21:29 ` Guenter Roeck
2021-02-23 12:57 ` Greg Kroah-Hartman
2021-02-23 21:05 ` Shuah Khan
2021-02-24 0:12 ` Shuah Khan
2021-02-24 7:49 ` Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210222121018.164280405@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=jgrall@amazon.com \
--cc=jgross@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=stefano.stabellini@xilinx.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).