]> git.baikalelectronics.ru Git - kernel.git/commit
xen-blkback: fix compatibility bug with single page rings
authorPaul Durrant <pdurrant@amazon.com>
Tue, 2 Feb 2021 17:56:59 +0000 (17:56 +0000)
committerJuergen Gross <jgross@suse.com>
Fri, 23 Apr 2021 07:34:07 +0000 (09:34 +0200)
commit1de39d520f7571e771dd13cae9d366bdb0cc1bd0
treef1ad22d7310bbfb538fa4fc18bbaec2268279a03
parent53fde1e255b5824881b89b0bbef475c82dee3caf
xen-blkback: fix compatibility bug with single page rings

Prior to commit 18ccfe6ba1c8 ("xen/blkback: rework connect_ring() to avoid
inconsistent xenstore 'ring-page-order' set by malicious blkfront"), the
behaviour of xen-blkback when connecting to a frontend was:

- read 'ring-page-order'
- if not present then expect a single page ring specified by 'ring-ref'
- else expect a ring specified by 'ring-refX' where X is between 0 and
  1 << ring-page-order

This was correct behaviour, but was broken by the afforementioned commit to
become:

- read 'ring-page-order'
- if not present then expect a single page ring (i.e. ring-page-order = 0)
- expect a ring specified by 'ring-refX' where X is between 0 and
  1 << ring-page-order
- if that didn't work then see if there's a single page ring specified by
  'ring-ref'

This incorrect behaviour works most of the time but fails when a frontend
that sets 'ring-page-order' is unloaded and replaced by one that does not
because, instead of reading 'ring-ref', xen-blkback will read the stale
'ring-ref0' left around by the previous frontend will try to map the wrong
grant reference.

This patch restores the original behaviour.

Fixes: 18ccfe6ba1c8 ("xen/blkback: rework connect_ring() to avoid inconsistent xenstore 'ring-page-order' set by malicious blkfront")
Signed-off-by: Paul Durrant <pdurrant@amazon.com>
Reviewed-by: Dongli Zhang <dongli.zhang@oracle.com>
Reviewed-by: "Roger Pau Monné" <roger.pau@citrix.com>
Link: https://lore.kernel.org/r/20210202175659.18452-1-paul@xen.org
Signed-off-by: Juergen Gross <jgross@suse.com>
drivers/block/xen-blkback/common.h
drivers/block/xen-blkback/xenbus.c