From: "Roger Pau Monné" <roger.pau@citrix.com>
To: Juergen Gross <jgross@suse.com>
Cc: <xen-devel@lists.xenproject.org>, <linux-block@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
Boris Ostrovsky <boris.ostrovsky@oracle.com>,
Stefano Stabellini <sstabellini@kernel.org>,
Jens Axboe <axboe@kernel.dk>, Jan Beulich <jbeulich@suse.com>
Subject: Re: [PATCH v2 2/3] xen/blkfront: don't take local copy of a request from the ring page
Date: Fri, 9 Jul 2021 10:55:37 +0200 [thread overview]
Message-ID: <YOgPCZbEF+t5DN+G@Air-de-Roger> (raw)
In-Reply-To: <20210708124345.10173-3-jgross@suse.com>
On Thu, Jul 08, 2021 at 02:43:44PM +0200, Juergen Gross wrote:
> In order to avoid a malicious backend being able to influence the local
> copy of a request build the request locally first and then copy it to
> the ring page instead of doing it the other way round as today.
>
> Signed-off-by: Juergen Gross <jgross@suse.com>
> Reviewed-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Roger Pau Monné <roger.pau@citrx.com>
Thanks!
One unrelated comment below.
> ---
> V2:
> - init variable to avoid potential compiler warning (Jan Beulich)
> ---
> drivers/block/xen-blkfront.c | 25 +++++++++++++++----------
> 1 file changed, 15 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
> index 86356014d35e..80701860870a 100644
> --- a/drivers/block/xen-blkfront.c
> +++ b/drivers/block/xen-blkfront.c
> @@ -546,7 +546,7 @@ static unsigned long blkif_ring_get_request(struct blkfront_ring_info *rinfo,
> rinfo->shadow[id].status = REQ_WAITING;
> rinfo->shadow[id].associated_id = NO_ASSOCIATED_ID;
>
> - (*ring_req)->u.rw.id = id;
> + rinfo->shadow[id].req.u.rw.id = id;
>
> return id;
> }
> @@ -554,11 +554,12 @@ static unsigned long blkif_ring_get_request(struct blkfront_ring_info *rinfo,
> static int blkif_queue_discard_req(struct request *req, struct blkfront_ring_info *rinfo)
> {
> struct blkfront_info *info = rinfo->dev_info;
> - struct blkif_request *ring_req;
> + struct blkif_request *ring_req, *final_ring_req;
> unsigned long id;
>
> /* Fill out a communications ring structure. */
> - id = blkif_ring_get_request(rinfo, req, &ring_req);
> + id = blkif_ring_get_request(rinfo, req, &final_ring_req);
> + ring_req = &rinfo->shadow[id].req;
>
> ring_req->operation = BLKIF_OP_DISCARD;
> ring_req->u.discard.nr_sectors = blk_rq_sectors(req);
> @@ -569,8 +570,8 @@ static int blkif_queue_discard_req(struct request *req, struct blkfront_ring_inf
> else
> ring_req->u.discard.flag = 0;
>
> - /* Keep a private copy so we can reissue requests when recovering. */
> - rinfo->shadow[id].req = *ring_req;
> + /* Copy the request to the ring page. */
> + *final_ring_req = *ring_req;
>
> return 0;
> }
> @@ -703,6 +704,7 @@ static int blkif_queue_rw_req(struct request *req, struct blkfront_ring_info *ri
> {
> struct blkfront_info *info = rinfo->dev_info;
> struct blkif_request *ring_req, *extra_ring_req = NULL;
> + struct blkif_request *final_ring_req, *final_extra_ring_req = NULL;
> unsigned long id, extra_id = NO_ASSOCIATED_ID;
> bool require_extra_req = false;
> int i;
> @@ -747,7 +749,8 @@ static int blkif_queue_rw_req(struct request *req, struct blkfront_ring_info *ri
> }
>
> /* Fill out a communications ring structure. */
> - id = blkif_ring_get_request(rinfo, req, &ring_req);
> + id = blkif_ring_get_request(rinfo, req, &final_ring_req);
> + ring_req = &rinfo->shadow[id].req;
>
> num_sg = blk_rq_map_sg(req->q, req, rinfo->shadow[id].sg);
> num_grant = 0;
> @@ -798,7 +801,9 @@ static int blkif_queue_rw_req(struct request *req, struct blkfront_ring_info *ri
> ring_req->u.rw.nr_segments = num_grant;
> if (unlikely(require_extra_req)) {
> extra_id = blkif_ring_get_request(rinfo, req,
> - &extra_ring_req);
> + &final_extra_ring_req);
> + extra_ring_req = &rinfo->shadow[extra_id].req;
I'm slightly confused about this extra request stuff because I cannot
find any check that asserts we have two empty slots on the ring before
getting here (I only see a RING_FULL check in blkif_queue_rq).
This is AFAIK only used on Arm when guest page size > 4KB.
Roger.
next prev parent reply other threads:[~2021-07-09 9:02 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-08 12:43 [PATCH v2 0/3] xen: harden blkfront against malicious backends Juergen Gross
2021-07-08 12:43 ` [PATCH v2 1/3] xen/blkfront: read response from backend only once Juergen Gross
2021-07-09 8:33 ` Roger Pau Monné
2021-07-08 12:43 ` [PATCH v2 2/3] xen/blkfront: don't take local copy of a request from the ring page Juergen Gross
2021-07-09 8:55 ` Roger Pau Monné [this message]
2021-07-09 13:54 ` Juergen Gross
2021-07-08 12:43 ` [PATCH v2 3/3] xen/blkfront: don't trust the backend response data blindly Juergen Gross
2021-07-08 13:11 ` Jan Beulich
2021-07-08 13:14 ` Juergen Gross
2021-07-09 9:42 ` Roger Pau Monné
2021-07-09 13:58 ` Juergen Gross
2021-07-09 11:09 ` kernel test robot
2021-07-30 10:08 ` Juergen Gross
2021-07-30 10:31 ` Juergen Gross
2021-07-08 14:22 ` [PATCH v2 0/3] xen: harden blkfront against malicious backends Konrad Rzeszutek Wilk
2021-07-08 14:39 ` Juergen Gross
2021-07-10 1:18 ` Marek Marczykowski-Górecki
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=YOgPCZbEF+t5DN+G@Air-de-Roger \
--to=roger.pau@citrix.com \
--cc=axboe@kernel.dk \
--cc=boris.ostrovsky@oracle.com \
--cc=jbeulich@suse.com \
--cc=jgross@suse.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sstabellini@kernel.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).