> From: Bjoern Doebel <doe...@amazon.de> > Sent: Monday, March 7, 2022 11:53 AM > To: xen-devel@lists.xenproject.org <xen-devel@lists.xenproject.org> > Cc: Michael Kurth <m...@amazon.de>; Martin Pohlack <mpohl...@amazon.de>; > Roger Pau Monne <roger....@citrix.com>; Andrew Cooper > <andrew.coop...@citrix.com>; Bjoern Doebel <doe...@amazon.de>; Konrad > Rzeszutek Wilk <konrad.w...@oracle.com>; Ross Lagerwall > <ross.lagerw...@citrix.com> > Subject: [PATCH 1/2] Livepatch: resolve old address before function > verification > > When verifying that a livepatch can be applied, we may as well want to > inspect the target function to be patched. To do so, we need to resolve > this function's address before running the arch-specific > livepatch_verify hook. > > Signed-off-by: Bjoern Doebel <doe...@amazon.de> > CC: Konrad Rzeszutek Wilk <konrad.w...@oracle.com> > CC: Ross Lagerwall <ross.lagerw...@citrix.com> > --- > xen/common/livepatch.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/xen/common/livepatch.c b/xen/common/livepatch.c > index ec301a9f12..be2cf75c2d 100644 > --- a/xen/common/livepatch.c > +++ b/xen/common/livepatch.c > @@ -684,11 +684,11 @@ static int prepare_payload(struct payload *payload, > return -EINVAL; > } > > - rc = arch_livepatch_verify_func(f); > + rc = resolve_old_address(f, elf); > if ( rc ) > return rc; > > - rc = resolve_old_address(f, elf); > + rc = arch_livepatch_verify_func(f); > if ( rc ) > return rc; > > -- > 2.32.0
Reviewed-by: Ross Lagerwall <ross.lagerw...@citrix.com>
