From: "Roger Pau Monné" <roger.pau@citrix.com>
To: Jan Beulich <jbeulich@suse.com>
Cc: "xen-devel@lists.xenproject.org" <xen-devel@lists.xenproject.org>,
Andrew Cooper <andrew.cooper3@citrix.com>, Wei Liu <wl@xen.org>,
George Dunlap <george.dunlap@citrix.com>,
Ian Jackson <iwj@xenproject.org>
Subject: Re: [PATCH v2 5/8] x86/gdbsx: convert "user" to "guest" accesses
Date: Mon, 22 Feb 2021 16:31:06 +0100 [thread overview]
Message-ID: <YDPOOpC6/wGZaAkA@Air-de-Roger> (raw)
In-Reply-To: <d1a1b9eb-33b4-4d07-9465-189699f88323@suse.com>
On Wed, Feb 17, 2021 at 09:21:36AM +0100, Jan Beulich wrote:
> Using copy_{from,to}_user(), this code was assuming to be called only by
> PV guests. Use copy_{from,to}_guest() instead, transforming the incoming
> structure field into a guest handle (the field should really have been
> one in the first place). Also do not transform the debuggee address into
> a pointer.
>
> Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Roger Pau Monné <roger.pau@citrix.com>
One minor comment below that can be taken care of when committing I
think.
> ---
> v2: Re-base (bug fix side effect was taken care of already).
>
> --- a/xen/arch/x86/debug.c
> +++ b/xen/arch/x86/debug.c
> @@ -108,12 +108,11 @@ dbg_pv_va2mfn(dbgva_t vaddr, struct doma
> }
>
> /* Returns: number of bytes remaining to be copied */
> -static unsigned int dbg_rw_guest_mem(struct domain *dp, void * __user gaddr,
> - void * __user buf, unsigned int len,
> - bool toaddr, uint64_t pgd3)
> +static unsigned int dbg_rw_guest_mem(struct domain *dp, unsigned long addr,
> + XEN_GUEST_HANDLE_PARAM(void) buf,
> + unsigned int len, bool toaddr,
> + uint64_t pgd3)
> {
> - unsigned long addr = (unsigned long)gaddr;
> -
> while ( len > 0 )
> {
> char *va;
> @@ -134,20 +133,18 @@ static unsigned int dbg_rw_guest_mem(str
>
> if ( toaddr )
> {
> - copy_from_user(va, buf, pagecnt); /* va = buf */
> + copy_from_guest(va, buf, pagecnt);
> paging_mark_dirty(dp, mfn);
> }
> else
> - {
> - copy_to_user(buf, va, pagecnt); /* buf = va */
> - }
> + copy_to_guest(buf, va, pagecnt);
>
> unmap_domain_page(va);
> if ( !gfn_eq(gfn, INVALID_GFN) )
> put_gfn(dp, gfn_x(gfn));
>
> addr += pagecnt;
> - buf += pagecnt;
> + guest_handle_add_offset(buf, pagecnt);
> len -= pagecnt;
> }
>
> @@ -161,7 +158,7 @@ static unsigned int dbg_rw_guest_mem(str
> * pgd3: value of init_mm.pgd[3] in guest. see above.
> * Returns: number of bytes remaining to be copied.
> */
> -unsigned int dbg_rw_mem(void * __user addr, void * __user buf,
> +unsigned int dbg_rw_mem(unsigned long gva, XEN_GUEST_HANDLE_PARAM(void) buf,
> unsigned int len, domid_t domid, bool toaddr,
> uint64_t pgd3)
You change the prototype below to make pgd3 unsigned long, so you
should change the type here also? (and likely in dbg_rw_guest_mem?)
Thanks, Roger.
next prev parent reply other threads:[~2021-02-22 15:32 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-17 8:16 [PATCH v2 0/8] x86/PV: avoid speculation abuse through guest accessors Jan Beulich
2021-02-17 8:19 ` [PATCH v2 1/8] x86: split __{get,put}_user() into "guest" and "unsafe" variants Jan Beulich
2021-02-17 8:20 ` [PATCH v2 2/8] x86: split __copy_{from,to}_user() " Jan Beulich
2021-02-17 8:20 ` [PATCH v2 3/8] x86/PV: harden guest memory accesses against speculative abuse Jan Beulich
2021-02-17 8:21 ` [PATCH v2 4/8] x86: rename {get,put}_user() to {get,put}_guest() Jan Beulich
2021-02-22 15:22 ` Roger Pau Monné
2021-02-17 8:21 ` [PATCH v2 5/8] x86/gdbsx: convert "user" to "guest" accesses Jan Beulich
2021-02-22 15:31 ` Roger Pau Monné [this message]
2021-02-22 15:55 ` Jan Beulich
2021-02-22 16:08 ` Roger Pau Monné
2021-02-17 8:22 ` [PATCH v2 6/8] x86: rename copy_{from,to}_user() to copy_{from,to}_guest_pv() Jan Beulich
2021-02-23 11:04 ` Roger Pau Monné
2021-02-23 15:15 ` Jan Beulich
2021-02-17 8:22 ` [PATCH v2 7/8] x86: move stac()/clac() from {get,put}_unsafe_asm() Jan Beulich
2021-02-23 11:40 ` Roger Pau Monné
2021-02-17 8:23 ` [PATCH v2 8/8] x86/PV: use get_unsafe() instead of copy_from_unsafe() Jan Beulich
2021-02-23 11:59 ` Roger Pau Monné
2021-02-23 15:25 ` Jan Beulich
2021-02-23 15:37 ` Roger Pau Monné
2021-02-23 16:13 ` Jan Beulich
2021-02-23 18:03 ` Roger Pau Monné
2021-02-19 15:50 ` [PATCH v2 0/8] x86/PV: avoid speculation abuse through guest accessors Ian Jackson
2021-02-19 15:56 ` Jan Beulich
2021-02-19 16:13 ` Ian Jackson
2021-02-19 16:16 ` Jan Beulich
2021-02-19 16:30 ` Ian Jackson
2021-02-24 11:13 ` Jan Beulich
2021-02-24 13:08 ` Ian Jackson
2021-02-24 13:18 ` Jan Beulich
2021-02-24 13:26 ` Ian Jackson
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=YDPOOpC6/wGZaAkA@Air-de-Roger \
--to=roger.pau@citrix.com \
--cc=andrew.cooper3@citrix.com \
--cc=george.dunlap@citrix.com \
--cc=iwj@xenproject.org \
--cc=jbeulich@suse.com \
--cc=wl@xen.org \
--cc=xen-devel@lists.xenproject.org \
/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).