livepatch: make symbol resolution more robust
v2 cover livepatch: make symbol resolution more robust
Hello,
Previously a single patch, now with a pre-patch to place the init section markers into a common file.
Thanks, Roger.
Roger Pau Monne (2):
xen: introduce header file with section related symbols
livepatch: refuse to resolve symbols that belong to init sections
xen/arch/arm/mmu/setup.c | 3 +-- xen/arch/x86/setup.c | 3 +-- xen/common/livepatch_elf.c | 16 ++++++++++++++++ xen/include/xen/sections.h | 17 +++++++++++++++++ 4 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 xen/include/xen/sections.h
Signature · 1 line
2.44.0
PATCH v2 1/2 xen: introduce header file with section related symbols
Start by declaring the beginning and end of the init section.
No functional change intended.
--- xen/arch/arm/mmu/setup.c | 3 +-- xen/arch/x86/setup.c | 3 +-- xen/include/xen/sections.h | 17 +++++++++++++++++ 3 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 xen/include/xen/sections.h
xen/arch/arm/mmu/setup.c +1 -2
@@ -7,6 +7,7 @@#include <xen/init.h> #include <xen/libfdt/libfdt.h> +#include <xen/sections.h> #include <xen/sizes.h> #include <xen/vmap.h>
@@ -62,8 +63,6 @@ vaddr_t directmap_virt_start __read_mostly;unsigned long directmap_base_pdx__read_mostly ;#endif -extern char __init_begin[], __init_end[]; -/* Checking VA memory layout alignment. */ static void __init __maybe_unused build_assertions (void ) {
xen/arch/x86/setup.c +1 -2
@@ -5,6 +5,7 @@#include <xen/param.h> #include <xen/sched.h> #include <xen/domain.h> +#include <xen/sections.h> #include <xen/serial.h> #include <xen/softirq.h> #include <xen/acpi.h>
@@ -309,8 +310,6 @@ void __init discard_initial_images(void) initial_images =NULL ; } -extern unsigned char __init_begin[], __init_end[]; -static void __init init_idle_domain (void ) {scheduler_init ();
xen/include/xen/sections.h new file +17 -0
@@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef __XEN_SECTIONS_H__ +#define __XEN_SECTIONS_H__ + +/* SAF-0-safe */ +extern char __init_begin[], __init_end[]; + +#endif /* !__XEN_SECTIONS_H__ */ +/* +* Local variables: +* mode: C +* c-file-style: "BSD" +* c-basic-offset: 4 +* indent-tabs-mode: nil +* End: +*/
Signature · 1 line
2.44.0
Re: [PATCH v2 1/2] xen: introduce header file with section related symbols
Quoted 6 lines · Roger Pau Monne
Start by declaring the beginning and end of the init section.
No functional change intended.
Requested-by Andrew Cooper <[email protected]>Signed-off-by Roger Pau Monné <[email protected]>
TYVM for doing this. There's a lot of cleanup which can follow on for it.
although if anyone has a better name than sections.h then speak now.
Re: [PATCH v2 1/2] xen: introduce header file with section related symbols
Quoted 5 lines · Andrew Cooper
Quoted 4 lines · Roger Pau Monne
Start by declaring the beginning and end of the init section.
No functional change intended.
Quoted 8 lines
Quoted 2 lines
Requested-by Andrew Cooper <[email protected]>Signed-off-by Roger Pau Monné <[email protected]>TYVM for doing this. There's a lot of cleanup which can follow on for it.
Reviewed-by Andrew Cooper <[email protected]>although if anyone has a better name than
sections.hthen speak now.
For what is put there now, and for any other section bounds markers the name is fine with me. I'm not presently convinced though we want to put __read_mostly and friends there.
Jan
Re: [PATCH v2 1/2] xen: introduce header file with section related symbols
Quoted 8 lines · Jan Beulich
Quoted 7 lines · Andrew Cooper
Quoted 6 lines · Roger Pau Monne
Start by declaring the beginning and end of the init section.
No functional change intended.
Requested-by Andrew Cooper <[email protected]>Signed-off-by Roger Pau Monné <[email protected]>
Quoted 8 lines
Quoted 5 lines
TYVM for doing this. There's a lot of cleanup which can follow on for it.
Reviewed-by Andrew Cooper <[email protected]>although if anyone has a better name than
sections.hthen speak now.For what is put there now, and for any other section bounds markers the name is fine with me. I'm not presently convinced though we want to put
__read_mostlyand friends there.
Well that's exactly what I intend to clean up into it, because it's far better in sections.h than (duplicated per arch) cache.h
(Also I intend to strip down kernel.h for the other major sections too.)
~Andrew
Re: [PATCH v2 1/2] xen: introduce header file with section related symbols
Quoted 13 lines · Andrew Cooper
Quoted 12 lines · Jan Beulich
Quoted 11 lines · Andrew Cooper
Quoted 6 lines · Roger Pau Monne
Start by declaring the beginning and end of the init section.
No functional change intended.
Requested-by Andrew Cooper <[email protected]>Signed-off-by Roger Pau Monné <[email protected]>TYVM for doing this. There's a lot of cleanup which can follow on for it.
Reviewed-by Andrew Cooper <[email protected]>
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
although if anyone has a better name than
sections.hthen speak now.For what is put there now, and for any other section bounds markers the name is fine with me. I'm not presently convinced though we want to put
__read_mostlyand friends there.Well that's exactly what I intend to clean up into it, because it's far better in
sections.hthan (duplicated per arch)cache.h
The duplication per arch has had a patch pending for a long time, which you've been blocking. What you're suggesting is not only a very different sections-related use of the header (which is probably okay), but also requires touching a fair part of the code base (each and every .c file using __read_mostly). That's what I'd like to avoid. Yet what I could live with if it's not me needing to perform this tedious work (hence why I didn't want to adjust my patch along these lines).
Quoted 1 line
(Also I intend to strip down
kernel.hfor the other major sections too.)
I certainly have no issue with this; I was in fact already expecting that to happen as a follow-on step.
Jan
Re: [PATCH v2 1/2] xen: introduce header file with section related symbols
In reply to Roger Pau MonneQuoted 4 lines · Roger Pau Monne
Start by declaring the beginning and end of the init section.
No functional change intended.
Quoted 8 lines
Requested-by Andrew Cooper <[email protected]>Signed-off-by Roger Pau Monné <[email protected]>--- xen/arch/arm/mmu/setup.c | 3 +-- xen/arch/x86/setup.c | 3 +-- xen/include/xen/sections.h | 17 +++++++++++++++++ 3 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 xen/include/xen/sections.h
Noticing a few things only after committing / pushing: For one, I should have waited for an Arm ack. I hope that's not a big issue.
Quoted 11 lines
xen/arch/arm/mmu/setup.c +1
-0@@ -7,6 +7,7 @@#include <xen/init.h> #include <xen/libfdt/libfdt.h> +#include <xen/sections.h> #include <xen/sizes.h> #include <xen/vmap.h>
xen/arch/arm/mmu/setup.c vaddr_t directmap_virt_start __read_mostly; · line 65
Quoted 4 lines
xen/arch/arm/mmu/setup.c +0
-1@@ -62,8 +63,6 @@ vaddr_t directmap_virt_start __read_mostly;unsigned long directmap_base_pdx__read_mostly ;#endif -extern char __init_begin[], __init_end[];
Then I wonder why it was this rather than ...
Quoted 11 lines
xen/arch/x86/setup.c +1
-0@@ -5,6 +5,7 @@#include <xen/param.h> #include <xen/sched.h> #include <xen/domain.h> +#include <xen/sections.h> #include <xen/serial.h> #include <xen/softirq.h> #include <xen/acpi.h>
xen/arch/x86/setup.c void __init discard_initial_images(void) · line 312
Quoted 4 lines
xen/arch/x86/setup.c +0
-1@@ -309,8 +310,6 @@ void __init discard_initial_images(void) initial_images =NULL ; } -extern unsigned char __init_begin[], __init_end[];
... this ...
xen/include/xen/sections.h line 7
Quoted 10 lines
xen/include/xen/sections.h new file +7
-0@@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef __XEN_SECTIONS_H__ +#define __XEN_SECTIONS_H__ + +/* SAF-0-safe */ +extern char __init_begin[], __init_end[];
... that was moved. "unsigned char" is generally preferred over declaring binary stuff "strings". I further wonder why the opportunity wasn't taken to make both array-of-const. And finally I'm slightly puzzled by the SAF comment appearing with no mention at all in the description; of course I don't mind its addition.
Jan
Re: [PATCH v2 1/2] xen: introduce header file with section related symbols
Quoted 21 lines · Jan Beulich
On 19.04.2024 12:02, Roger Pau Monne wrote:
Then I wonder why it was this rather than ...Quoted 11 lines
xen/arch/x86/setup.c +1
-0@@ -5,6 +5,7 @@#include <xen/param.h> #include <xen/sched.h> #include <xen/domain.h> +#include <xen/sections.h> #include <xen/serial.h> #include <xen/softirq.h> #include <xen/acpi.h> xen/arch/x86/setup.c void __init discard_initial_images(void) · line 312
Quoted 4 lines
xen/arch/x86/setup.c +0
-1@@ -309,8 +310,6 @@ void __init discard_initial_images(void) initial_images =NULL ; } -extern unsigned char __init_begin[], __init_end[];... this ...
Quoted 13 lines
xen/include/xen/sections.h line 7
Quoted 10 lines
xen/include/xen/sections.h new file +7
-0@@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef __XEN_SECTIONS_H__ +#define __XEN_SECTIONS_H__ + +/* SAF-0-safe */ +extern char __init_begin[], __init_end[];... that was moved. "unsigned char" is generally preferred over declaring binary stuff "strings".
OK, noted.
Quoted 2 lines
I further wonder why the opportunity
wasn't taken to make both array-of-const.
Hm, yes. The sections are mapped RWX IIRC, but there's no reason to not make the markers const.
Quoted 3 lines
And finally I'm slightly
puzzled by the SAF comment appearing with no mention at all in the description; of course I don't mind its addition.
I could have noted it in the commit message indeed, sorry.
Thanks, Roger.
PATCH v2 2/2 livepatch: refuse to resolve symbols that belong to init sections
In reply to Roger Pau MonneLivepatch payloads containing symbols that belong to init sections can only lead to page faults later on, as by the time the livepatch is loaded init sections have already been freed.
Refuse to resolve such symbols and return an error instead.
Note such resolutions are only relevant for symbols that point to undefined sections (SHN_UNDEF), as that implies the symbol is not in the current payload and hence must either be a Xen or a different livepatch payload symbol.
Do not allow to resolve symbols that point to __init_begin, as that address is also unmapped. On the other hand, __init_end is not unmapped, and hence allow resolutions against it.
---
Changes since v1:
- Fix off-by-one in range checking.
--- xen/common/livepatch_elf.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
xen/common/livepatch_elf.c +16 -0
@@ -4,6 +4,7 @@#include <xen/errno.h> #include <xen/lib.h> +#include <xen/sections.h> #include <xen/symbols.h> #include <xen/livepatch_elf.h> #include <xen/livepatch.h>
@@ -310,6 +311,21 @@ int livepatch_elf_resolve_symbols(struct livepatch_elf *elf)break ; } } + +/* +* Ensure not an init symbol. Only applicable to Xen symbols, as +* livepatch payloads don't have init sections or equivalent. +*/ +else if ( st_value >= (uintptr_t )&__init_begin && + st_value < (uintptr_t )&__init_end ) + { + printk(XENLOG_ERR LIVEPATCH +"%s: symbol %s is in init section, not resolving\n" , + elf->name, elf->sym[i].name); + rc = -ENXIO ; +break ; + } +dprintk (XENLOG_DEBUG ,LIVEPATCH "%s: Undefined symbol resolved: %s => %#" PRIxElfAddr"\n" , elf->name, elf->sym[i].name, st_value);break ;
Signature · 1 line
2.44.0
Re: [PATCH v2 2/2] livepatch: refuse to resolve symbols that belong to init sections
Quoted 10 lines · Roger Pau Monne
Livepatch payloads containing symbols that belong to init sections can only lead to page faults later on, as by the time the livepatch is loaded init sections have already been freed.
Refuse to resolve such symbols and return an error instead.
Note such resolutions are only relevant for symbols that point to undefined sections (
SHN_UNDEF), as that implies the symbol is not in the current payload and hence must either be a Xen or a different livepatch payload symbol.
Quoted 5 lines
Do not allow to resolve symbols that point to
__init_begin, as that address is also unmapped. On the other hand,__init_endis not unmapped, and hence allow resolutions against it.Signed-off-by Roger Pau Monné <[email protected]>
Quoted 20 lines
---
Changes since v1:
- Fix off-by-one in range checking.--- xen/common/livepatch_elf.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)xen/common/livepatch_elf.c +1
-0@@ -4,6 +4,7 @@#include <xen/errno.h> #include <xen/lib.h> +#include <xen/sections.h> #include <xen/symbols.h> #include <xen/livepatch_elf.h> #include <xen/livepatch.h>
xen/common/livepatch_elf.c int livepatch_elf_resolve_symbols(struct livepatch_elf *elf) · line 320
Quoted 10 lines
xen/common/livepatch_elf.c +7
-0@@ -310,6 +311,21 @@ int livepatch_elf_resolve_symbols(struct livepatch_elf *elf)break ; } } + +/* +* Ensure not an init symbol. Only applicable to Xen symbols, as +* livepatch payloads don't have init sections or equivalent. +*/ +else if ( st_value >= (uintptr_t )&__init_begin && + st_value < (uintptr_t )&__init_end )
... I normally vertically the (casts) in cases like this for improved legibility. Happy to fold on commit.
~Andrew
Re: [PATCH v2 2/2] livepatch: refuse to resolve symbols that belong to init sections
Quoted 44 lines · Andrew Cooper
Quoted 10 lines · Roger Pau Monne
Livepatch payloads containing symbols that belong to init sections can only lead to page faults later on, as by the time the livepatch is loaded init sections have already been freed.
Refuse to resolve such symbols and return an error instead.
Note such resolutions are only relevant for symbols that point to undefined sections (
SHN_UNDEF), as that implies the symbol is not in the current payload and hence must either be a Xen or a different livepatch payload symbol.Quoted 5 lines
Do not allow to resolve symbols that point to
__init_begin, as that address is also unmapped. On the other hand,__init_endis not unmapped, and hence allow resolutions against it.Signed-off-by Roger Pau Monné <[email protected]>Reviewed-by Andrew Cooper <[email protected]>, although ...Quoted 25 lines
---
Changes since v1:
- Fix off-by-one in range checking.--- xen/common/livepatch_elf.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)xen/common/livepatch_elf.c +3
-0@@ -4,6 +4,7 @@#include <xen/errno.h> #include <xen/lib.h> +#include <xen/sections.h> #include <xen/symbols.h> #include <xen/livepatch_elf.h> #include <xen/livepatch.h> @@ -310,6 +311,21 @@ int livepatch_elf_resolve_symbols(struct livepatch_elf *elf)break ; } } + +/*
Quoted 8 lines
xen/common/livepatch_elf.c int livepatch_elf_resolve_symbols(struct livepatch_elf *elf) · line 320
Quoted 5 lines
xen/common/livepatch_elf.c +5
-0+* Ensure not an init symbol. Only applicable to Xen symbols, as +* livepatch payloads don't have init sections or equivalent. +*/ + else if ( st_value >= (uintptr_t)&__init_begin && + st_value < (uintptr_t)&__init_end )... I normally vertically the (casts) in cases like this for improved legibility. Happy to fold on commit.
Did this, but reverted afterwards because I wasn't sure whether it would go against the coding style. Aligning would be my preference also.
Thanks, Roger.
Re: [PATCH v2 2/2] livepatch: refuse to resolve symbols that belong to init sections
In reply to Roger Pau MonneQuoted 10 lines · Roger Pau Monne
Livepatch payloads containing symbols that belong to init sections can only lead to page faults later on, as by the time the livepatch is loaded init sections have already been freed.
Refuse to resolve such symbols and return an error instead.
Note such resolutions are only relevant for symbols that point to undefined sections (
SHN_UNDEF), as that implies the symbol is not in the current payload and hence must either be a Xen or a different livepatch payload symbol.
Quoted 8 lines
Do not allow to resolve symbols that point to
__init_begin, as that address is also unmapped. On the other hand,__init_endis not unmapped, and hence allow resolutions against it.Signed-off-by Roger Pau Monné <[email protected]>---
Changes since v1:
- Fix off-by-one in range checking.
Which means you addressed Andrew's comment while at the same time extending the scope of ...
Quoted 5 lines
xen/common/livepatch_elf.c +1
-0@@ -310,6 +311,21 @@ int livepatch_elf_resolve_symbols(struct livepatch_elf *elf)break ; } } +
xen/common/livepatch_elf.c int livepatch_elf_resolve_symbols(struct livepatch_elf *elf) · line 324
Quoted 10 lines
xen/common/livepatch_elf.c +10
-0+/* +* Ensure not an init symbol. Only applicable to Xen symbols, as +* livepatch payloads don't have init sections or equivalent. +*/ + else if ( st_value >= (uintptr_t)&__init_begin && + st_value < (uintptr_t)&__init_end ) + { + printk(XENLOG_ERR LIVEPATCH +"%s: symbol %s is in init section, not resolving\n" , + elf->name, elf->sym[i].name);
... what I raised concern about (and I had not seen any verbal reply to that, I don't think).
Jan
Re: [PATCH v2 2/2] livepatch: refuse to resolve symbols that belong to init sections
Quoted 33 lines · Jan Beulich
Quoted 10 lines · Roger Pau Monne
Livepatch payloads containing symbols that belong to init sections can only lead to page faults later on, as by the time the livepatch is loaded init sections have already been freed.
Refuse to resolve such symbols and return an error instead.
Note such resolutions are only relevant for symbols that point to undefined sections (
SHN_UNDEF), as that implies the symbol is not in the current payload and hence must either be a Xen or a different livepatch payload symbol.Quoted 8 lines
Do not allow to resolve symbols that point to
__init_begin, as that address is also unmapped. On the other hand,__init_endis not unmapped, and hence allow resolutions against it.Signed-off-by Roger Pau Monné <[email protected]>---
Changes since v1:
- Fix off-by-one in range checking.Which means you addressed Andrew's comment while at the same time extending the scope of ...
Quoted 10 lines
xen/common/livepatch_elf.c +6
-0@@ -310,6 +311,21 @@ int livepatch_elf_resolve_symbols(struct livepatch_elf *elf)break ; } } + +/* +* Ensure not an init symbol. Only applicable to Xen symbols, as +* livepatch payloads don't have init sections or equivalent. +*/ + else if ( st_value >= (uintptr_t)&__init_begin &&
Quoted 8 lines
xen/common/livepatch_elf.c int livepatch_elf_resolve_symbols(struct livepatch_elf *elf) · line 324
Quoted 5 lines
xen/common/livepatch_elf.c +5
-0+ st_value < (uintptr_t)&__init_end ) + { + printk(XENLOG_ERR LIVEPATCH +"%s: symbol %s is in init section, not resolving\n" , + elf->name, elf->sym[i].name);... what I raised concern about (and I had not seen any verbal reply to that, I don't think).
I've extended the commit message to explicitly mention the handling of bounds for __init_{begin,end} checks. Let me know if you are not fine with it (or maybe you expected something else?).
Thanks, Roger.
Re: [PATCH v2 2/2] livepatch: refuse to resolve symbols that belong to init sections
Quoted 43 lines · Roger Pau Monné
Quoted 33 lines · Jan Beulich
Quoted 10 lines · Roger Pau Monne
Livepatch payloads containing symbols that belong to init sections can only lead to page faults later on, as by the time the livepatch is loaded init sections have already been freed.
Refuse to resolve such symbols and return an error instead.
Note such resolutions are only relevant for symbols that point to undefined sections (
SHN_UNDEF), as that implies the symbol is not in the current payload and hence must either be a Xen or a different livepatch payload symbol.Quoted 8 lines
Do not allow to resolve symbols that point to
__init_begin, as that address is also unmapped. On the other hand,__init_endis not unmapped, and hence allow resolutions against it.Signed-off-by Roger Pau Monné <[email protected]>---
Changes since v1:
- Fix off-by-one in range checking.Which means you addressed Andrew's comment while at the same time extending the scope of ...
Quoted 10 lines
xen/common/livepatch_elf.c +6
-0@@ -310,6 +311,21 @@ int livepatch_elf_resolve_symbols(struct livepatch_elf *elf)break ; } } + +/* +* Ensure not an init symbol. Only applicable to Xen symbols, as +* livepatch payloads don't have init sections or equivalent. +*/ + else if ( st_value >= (uintptr_t)&__init_begin &&Quoted 8 lines
xen/common/livepatch_elf.c int livepatch_elf_resolve_symbols(struct livepatch_elf *elf) · line 324
Quoted 5 lines
xen/common/livepatch_elf.c +5
-0+ st_value < (uintptr_t)&__init_end ) + { + printk(XENLOG_ERR LIVEPATCH +"%s: symbol %s is in init section, not resolving\n" , + elf->name, elf->sym[i].name);... what I raised concern about (and I had not seen any verbal reply to that, I don't think).
Quoted 3 lines
I've extended the commit message to explicitly mention the handling of bounds for __init_{begin,end} checks. Let me know if you are not fine with it (or maybe you expected something else?).
Well, you mention the two symbols you care about, but you don't mention at all that these two may alias other symbols which might be legal to reference from a livepatch.
Jan
Re: [PATCH v2 2/2] livepatch: refuse to resolve symbols that belong to init sections
Quoted 44 lines · Jan Beulich
Quoted 43 lines · Roger Pau Monné
Quoted 41 lines · Jan Beulich
Quoted 10 lines · Roger Pau Monne
Livepatch payloads containing symbols that belong to init sections can only lead to page faults later on, as by the time the livepatch is loaded init sections have already been freed.
Refuse to resolve such symbols and return an error instead.
Note such resolutions are only relevant for symbols that point to undefined sections (
SHN_UNDEF), as that implies the symbol is not in the current payload and hence must either be a Xen or a different livepatch payload symbol.Quoted 8 lines
Do not allow to resolve symbols that point to
__init_begin, as that address is also unmapped. On the other hand,__init_endis not unmapped, and hence allow resolutions against it.Signed-off-by Roger Pau Monné <[email protected]>---
Changes since v1:
- Fix off-by-one in range checking.Which means you addressed Andrew's comment while at the same time extending the scope of ...
Quoted 5 lines
xen/common/livepatch_elf.c +1
-0@@ -310,6 +311,21 @@ int livepatch_elf_resolve_symbols(struct livepatch_elf *elf)break ; } } +xen/common/livepatch_elf.c int livepatch_elf_resolve_symbols(struct livepatch_elf *elf) · line 324
Quoted 10 lines
xen/common/livepatch_elf.c +10
-0+/* +* Ensure not an init symbol. Only applicable to Xen symbols, as +* livepatch payloads don't have init sections or equivalent. +*/ + else if ( st_value >= (uintptr_t)&__init_begin && + st_value < (uintptr_t)&__init_end ) + { + printk(XENLOG_ERR LIVEPATCH +"%s: symbol %s is in init section, not resolving\n" , + elf->name, elf->sym[i].name);... what I raised concern about (and I had not seen any verbal reply to that, I don't think).
Quoted 7 lines
Quoted 3 lines
I've extended the commit message to explicitly mention the handling of bounds for __init_{begin,end} checks. Let me know if you are not fine with it (or maybe you expected something else?).
Well, you mention the two symbols you care about, but you don't mention at all that these two may alias other symbols which might be legal to reference from a livepatch.
I'm having a hard time understanding why a livepatch would want to reference those, or any symbol in the .init sections for that matter. __init_{begin,end} are exclusively used to unmap the init region after boot. What's the point in livepatch referencing data that's no longer there? The only application I would think of is to calculate some kind of offsets, but that would better be done using other symbols instead.
Please bear with me, it would be easier for me to understand if you could provide a concrete example.
Thanks, Roger.
Re: [PATCH v2 2/2] livepatch: refuse to resolve symbols that belong to init sections
Quoted 61 lines · Roger Pau Monné
Quoted 44 lines · Jan Beulich
Quoted 43 lines · Roger Pau Monné
Quoted 41 lines · Jan Beulich
Quoted 10 lines · Roger Pau Monne
Livepatch payloads containing symbols that belong to init sections can only lead to page faults later on, as by the time the livepatch is loaded init sections have already been freed.
Refuse to resolve such symbols and return an error instead.
Note such resolutions are only relevant for symbols that point to undefined sections (
SHN_UNDEF), as that implies the symbol is not in the current payload and hence must either be a Xen or a different livepatch payload symbol.Quoted 8 lines
Do not allow to resolve symbols that point to
__init_begin, as that address is also unmapped. On the other hand,__init_endis not unmapped, and hence allow resolutions against it.Signed-off-by Roger Pau Monné <[email protected]>---
Changes since v1:
- Fix off-by-one in range checking.Which means you addressed Andrew's comment while at the same time extending the scope of ...
Quoted 5 lines
xen/common/livepatch_elf.c +1
-0@@ -310,6 +311,21 @@ int livepatch_elf_resolve_symbols(struct livepatch_elf *elf)break ; } } +xen/common/livepatch_elf.c int livepatch_elf_resolve_symbols(struct livepatch_elf *elf) · line 324
Quoted 10 lines
xen/common/livepatch_elf.c +10
-0+/* +* Ensure not an init symbol. Only applicable to Xen symbols, as +* livepatch payloads don't have init sections or equivalent. +*/ + else if ( st_value >= (uintptr_t)&__init_begin && + st_value < (uintptr_t)&__init_end ) + { + printk(XENLOG_ERR LIVEPATCH +"%s: symbol %s is in init section, not resolving\n" , + elf->name, elf->sym[i].name);... what I raised concern about (and I had not seen any verbal reply to that, I don't think).
Quoted 7 lines
Quoted 3 lines
I've extended the commit message to explicitly mention the handling of bounds for __init_{begin,end} checks. Let me know if you are not fine with it (or maybe you expected something else?).
Well, you mention the two symbols you care about, but you don't mention at all that these two may alias other symbols which might be legal to reference from a livepatch.
I'm having a hard time understanding why a livepatch would want to reference those, or any symbol in the .init sections for that matter. __init_{begin,end} are exclusively used to unmap the init region after boot. What's the point in livepatch referencing data that's no longer there? The only application I would think of is to calculate some kind of offsets, but that would better be done using other symbols instead.
Quoted 2 lines
Please bear with me, it would be easier for me to understand if you could provide a concrete example.
The issue is that you do comparison by address, not by name. Let's assume that .rodata ends exactly where .init.* starts. Then &__init_begin == &_erodata == &__2M_rodata_end. Access to the latter two symbols wants to be permitted; only __init_begin and whatever ends up being the very first symbol in .init.* ought to not be referenced.
Worse (but contrived) would be cases of "constructed" symbols derived from ones ahead of __init_begin, with an offset large enough to actually point into .init.*. Such are _still_ valid to be used in calculations, as long as no deref occurs for anything at or past __init_begin.
Jan
Re: [PATCH v2 2/2] livepatch: refuse to resolve symbols that belong to init sections
Quoted 62 lines · Jan Beulich
Quoted 61 lines · Roger Pau Monné
Quoted 44 lines · Jan Beulich
Quoted 43 lines · Roger Pau Monné
Quoted 41 lines · Jan Beulich
Quoted 10 lines · Roger Pau Monne
Livepatch payloads containing symbols that belong to init sections can only lead to page faults later on, as by the time the livepatch is loaded init sections have already been freed.
Refuse to resolve such symbols and return an error instead.
Note such resolutions are only relevant for symbols that point to undefined sections (
SHN_UNDEF), as that implies the symbol is not in the current payload and hence must either be a Xen or a different livepatch payload symbol.Quoted 8 lines
Do not allow to resolve symbols that point to
__init_begin, as that address is also unmapped. On the other hand,__init_endis not unmapped, and hence allow resolutions against it.Signed-off-by Roger Pau Monné <[email protected]>---
Changes since v1:
- Fix off-by-one in range checking.Which means you addressed Andrew's comment while at the same time extending the scope of ...
Quoted 5 lines
xen/common/livepatch_elf.c +1
-0@@ -310,6 +311,21 @@ int livepatch_elf_resolve_symbols(struct livepatch_elf *elf)break ; } } +xen/common/livepatch_elf.c int livepatch_elf_resolve_symbols(struct livepatch_elf *elf) · line 324
Quoted 10 lines
xen/common/livepatch_elf.c +10
-0+/* +* Ensure not an init symbol. Only applicable to Xen symbols, as +* livepatch payloads don't have init sections or equivalent. +*/ + else if ( st_value >= (uintptr_t)&__init_begin && + st_value < (uintptr_t)&__init_end ) + { + printk(XENLOG_ERR LIVEPATCH +"%s: symbol %s is in init section, not resolving\n" , + elf->name, elf->sym[i].name);... what I raised concern about (and I had not seen any verbal reply to that, I don't think).
Quoted 7 lines
Quoted 3 lines
I've extended the commit message to explicitly mention the handling of bounds for __init_{begin,end} checks. Let me know if you are not fine with it (or maybe you expected something else?).
Well, you mention the two symbols you care about, but you don't mention at all that these two may alias other symbols which might be legal to reference from a livepatch.
I'm having a hard time understanding why a livepatch would want to reference those, or any symbol in the .init sections for that matter. __init_{begin,end} are exclusively used to unmap the init region after boot. What's the point in livepatch referencing data that's no longer there? The only application I would think of is to calculate some kind of offsets, but that would better be done using other symbols instead.
Quoted 8 lines
Quoted 2 lines
Please bear with me, it would be easier for me to understand if you could provide a concrete example.
The issue is that you do comparison by address, not by name. Let's assume that .rodata ends exactly where .init.* starts. Then
&__init_begin==&_erodata==&__2M_rodata_end. Access to the latter two symbols wants to be permitted; only__init_beginand whatever ends up being the very first symbol in .init.* ought to not be referenced.
Hm, I guess I could add comparison by name additionally, but it looks fragile to me.
So when st_value == __init_begin check if the name matches "__init_begin" or "__2M_init_start" or "_sinittext", and fail resolution, otherwise allow it?
Quoted 4 lines
Worse (but contrived) would be cases of "constructed" symbols derived from ones ahead of
__init_begin, with an offset large enough to actually point into .init.*. Such are _still_ valid to be used in calculations, as long as no deref occurs for anything at or past__init_begin.
But one would have to craft such a symbol specifically, at which point I consider this out of the scope of what this patch is attempting to protect against. The aim is not to prevent malicious livepatches, and there are far easier ways to trigger a page-fault from a livepatch.
Thanks, Roger.
Re: [PATCH v2 2/2] livepatch: refuse to resolve symbols that belong to init sections
Quoted 66 lines · Roger Pau Monné
Quoted 65 lines · Jan Beulich
Quoted 63 lines · Roger Pau Monné
Quoted 44 lines · Jan Beulich
Quoted 43 lines · Roger Pau Monné
Quoted 41 lines · Jan Beulich
Quoted 10 lines · Roger Pau Monne
Livepatch payloads containing symbols that belong to init sections can only lead to page faults later on, as by the time the livepatch is loaded init sections have already been freed.
Refuse to resolve such symbols and return an error instead.
Note such resolutions are only relevant for symbols that point to undefined sections (
SHN_UNDEF), as that implies the symbol is not in the current payload and hence must either be a Xen or a different livepatch payload symbol.Quoted 8 lines
Do not allow to resolve symbols that point to
__init_begin, as that address is also unmapped. On the other hand,__init_endis not unmapped, and hence allow resolutions against it.Signed-off-by Roger Pau Monné <[email protected]>---
Changes since v1:
- Fix off-by-one in range checking.Which means you addressed Andrew's comment while at the same time extending the scope of ...
Quoted 5 lines
(quoted diff) +1
-0@@ -310,6 +311,21 @@ int livepatch_elf_resolve_symbols(struct livepatch_elf *elf) break; } } +Review int livepatch_elf_resolve_symbols(struct livepatch_elf *elf) · line 324
Quoted 10 lines
(quoted diff) +10
-0+ /* + * Ensure not an init symbol. Only applicable to Xen symbols, as + * livepatch payloads don't have init sections or equivalent. + */ + else if ( st_value >= (uintptr_t)&__init_begin && + st_value < (uintptr_t)&__init_end ) + { + printk(XENLOG_ERR LIVEPATCH + "%s: symbol %s is in init section, not resolving\n", + elf->name, elf->sym[i].name);... what I raised concern about (and I had not seen any verbal reply to that, I don't think).
Quoted 7 lines
Quoted 3 lines
I've extended the commit message to explicitly mention the handling of bounds for __init_{begin,end} checks. Let me know if you are not fine with it (or maybe you expected something else?).
Well, you mention the two symbols you care about, but you don't mention at all that these two may alias other symbols which might be legal to reference from a livepatch.
I'm having a hard time understanding why a livepatch would want to reference those, or any symbol in the .init sections for that matter. __init_{begin,end} are exclusively used to unmap the init region after boot. What's the point in livepatch referencing data that's no longer there? The only application I would think of is to calculate some kind of offsets, but that would better be done using other symbols instead.
Please bear with me, it would be easier for me to understand if you could provide a concrete example.
Quoted 8 lines
Quoted 5 lines
The issue is that you do comparison by address, not by name. Let's assume that .rodata ends exactly where .init.* starts. Then
&__init_begin==&_erodata==&__2M_rodata_end. Access to the latter two symbols wants to be permitted; only__init_beginand whatever ends up being the very first symbol in .init.* ought to not be referenced.Hm, I guess I could add comparison by name additionally, but it looks fragile to me.
It looks fragile, yes. Thing is that you're trying to deal with this when crucial information was lost already. Or wait - isn't the section number still available in ->st_shndx?
Quoted 3 lines
So when
st_value==__init_begincheck if the name matches "__init_begin" or "__2M_init_start" or "_sinittext", and fail resolution, otherwise allow it?
Kind of, but that's not enough. For one, as said, the first symbol in the first .init.* section would also have this same address, and would also want rejecting. And then the same would be needed for __init_end.
Quoted 9 lines
Quoted 4 lines
Worse (but contrived) would be cases of "constructed" symbols derived from ones ahead of
__init_begin, with an offset large enough to actually point into .init.*. Such are _still_ valid to be used in calculations, as long as no deref occurs for anything at or past__init_begin.But one would have to craft such a symbol specifically, at which point I consider this out of the scope of what this patch is attempting to protect against. The aim is not to prevent malicious livepatches, and there are far easier ways to trigger a page-fault from a livepatch.
I understand the latter is the case, but I'm afraid I then don't see what the goal of this change is.
Jan
Re: [PATCH v2 2/2] livepatch: refuse to resolve symbols that belong to init sections
Quoted 73 lines · Jan Beulich
Quoted 72 lines · Roger Pau Monné
Quoted 70 lines · Jan Beulich
Quoted 61 lines · Roger Pau Monné
Quoted 44 lines · Jan Beulich
Quoted 43 lines · Roger Pau Monné
Quoted 41 lines · Jan Beulich
Quoted 10 lines · Roger Pau Monne
Livepatch payloads containing symbols that belong to init sections can only lead to page faults later on, as by the time the livepatch is loaded init sections have already been freed.
Refuse to resolve such symbols and return an error instead.
Note such resolutions are only relevant for symbols that point to undefined sections (
SHN_UNDEF), as that implies the symbol is not in the current payload and hence must either be a Xen or a different livepatch payload symbol.Quoted 8 lines
Do not allow to resolve symbols that point to
__init_begin, as that address is also unmapped. On the other hand,__init_endis not unmapped, and hence allow resolutions against it.Signed-off-by Roger Pau Monné <[email protected]>---
Changes since v1:
- Fix off-by-one in range checking.Which means you addressed Andrew's comment while at the same time extending the scope of ...
Quoted 5 lines
(quoted diff) +1
-0@@ -310,6 +311,21 @@ int livepatch_elf_resolve_symbols(struct livepatch_elf *elf) break; } } +Review int livepatch_elf_resolve_symbols(struct livepatch_elf *elf) · line 324
Quoted 10 lines
(quoted diff) +10
-0+ /* + * Ensure not an init symbol. Only applicable to Xen symbols, as + * livepatch payloads don't have init sections or equivalent. + */ + else if ( st_value >= (uintptr_t)&__init_begin && + st_value < (uintptr_t)&__init_end ) + { + printk(XENLOG_ERR LIVEPATCH + "%s: symbol %s is in init section, not resolving\n", + elf->name, elf->sym[i].name);... what I raised concern about (and I had not seen any verbal reply to that, I don't think).
Quoted 7 lines
Quoted 3 lines
I've extended the commit message to explicitly mention the handling of bounds for __init_{begin,end} checks. Let me know if you are not fine with it (or maybe you expected something else?).
Well, you mention the two symbols you care about, but you don't mention at all that these two may alias other symbols which might be legal to reference from a livepatch.
I'm having a hard time understanding why a livepatch would want to reference those, or any symbol in the .init sections for that matter. __init_{begin,end} are exclusively used to unmap the init region after boot. What's the point in livepatch referencing data that's no longer there? The only application I would think of is to calculate some kind of offsets, but that would better be done using other symbols instead.
Quoted 2 lines
Please bear with me, it would be easier for me to understand if you could provide a concrete example.
The issue is that you do comparison by address, not by name. Let's assume that .rodata ends exactly where .init.* starts. Then
&__init_begin==&_erodata==&__2M_rodata_end. Access to the latter two symbols wants to be permitted; only__init_beginand whatever ends up being the very first symbol in .init.* ought to not be referenced.
Quoted 6 lines
Quoted 2 lines
Hm, I guess I could add comparison by name additionally, but it looks fragile to me.
It looks fragile, yes. Thing is that you're trying to deal with this when crucial information was lost already. Or wait - isn't the section number still available in ->st_shndx?
But that's the section number of the to be resolved symbol? In the livepatch payload it would for example appear as:
0000000000000000 F *UND* 0000000000000000 .hidden setup_boot_APIC_clock
With undefined section.
It's possible I'm not following, is there a way to get the section number of the current Xen symbols, and then correlate it with the .init section?
Overall, I think it's unlikely for a livepatch to care about the section start/end markers, albeit it would be good if we could make this less ambiguous.
Quoted 14 lines
Quoted 4 lines
So when
st_value==__init_begincheck if the name matches "__init_begin" or "__2M_init_start" or "_sinittext", and fail resolution, otherwise allow it?Kind of, but that's not enough. For one, as said, the first symbol in the first .init.* section would also have this same address, and would also want rejecting. And then the same would be needed for
__init_end.Quoted 5 lines
Quoted 4 lines
Worse (but contrived) would be cases of "constructed" symbols derived from ones ahead of
__init_begin, with an offset large enough to actually point into .init.*. Such are _still_ valid to be used in calculations, as long as no deref occurs for anything at or past__init_begin.
Quoted 7 lines
Quoted 4 lines
But one would have to craft such a symbol specifically, at which point I consider this out of the scope of what this patch is attempting to protect against. The aim is not to prevent malicious livepatches, and there are far easier ways to trigger a page-fault from a livepatch.
I understand the latter is the case, but I'm afraid I then don't see what the goal of this change is.
The goal would be for something like what caused:
https://xenbits.xen.org/gitweb/?p=xen.git;a=commit;h=af4cd0a6a61cdb03bc1afca9478b05b0c9703599
To be rejected at load time instead of causing a page-fault during alternative patching, because xsm_ops was (wrongly) an .init symbol.
Thanks, Roger.
Re: [PATCH v2 2/2] livepatch: refuse to resolve symbols that belong to init sections
Quoted 84 lines · Roger Pau Monné
Quoted 73 lines · Jan Beulich
Quoted 72 lines · Roger Pau Monné
Quoted 70 lines · Jan Beulich
Quoted 61 lines · Roger Pau Monné
Quoted 44 lines · Jan Beulich
Quoted 43 lines · Roger Pau Monné
Quoted 41 lines · Jan Beulich
Quoted 10 lines · Roger Pau Monne
Livepatch payloads containing symbols that belong to init sections can only lead to page faults later on, as by the time the livepatch is loaded init sections have already been freed.
Refuse to resolve such symbols and return an error instead.
Note such resolutions are only relevant for symbols that point to undefined sections (
SHN_UNDEF), as that implies the symbol is not in the current payload and hence must either be a Xen or a different livepatch payload symbol.Quoted 8 lines
Do not allow to resolve symbols that point to
__init_begin, as that address is also unmapped. On the other hand,__init_endis not unmapped, and hence allow resolutions against it.Signed-off-by Roger Pau Monné <[email protected]>---
Changes since v1:
- Fix off-by-one in range checking.Which means you addressed Andrew's comment while at the same time extending the scope of ...
Quoted 5 lines
(quoted diff) +1
-0@@ -310,6 +311,21 @@ int livepatch_elf_resolve_symbols(struct livepatch_elf *elf) break; } } +Review int livepatch_elf_resolve_symbols(struct livepatch_elf *elf) · line 324
Quoted 10 lines
(quoted diff) +10
-0+ /* + * Ensure not an init symbol. Only applicable to Xen symbols, as + * livepatch payloads don't have init sections or equivalent. + */ + else if ( st_value >= (uintptr_t)&__init_begin && + st_value < (uintptr_t)&__init_end ) + { + printk(XENLOG_ERR LIVEPATCH + "%s: symbol %s is in init section, not resolving\n", + elf->name, elf->sym[i].name);... what I raised concern about (and I had not seen any verbal reply to that, I don't think).
Quoted 7 lines
Quoted 3 lines
I've extended the commit message to explicitly mention the handling of bounds for __init_{begin,end} checks. Let me know if you are not fine with it (or maybe you expected something else?).
Well, you mention the two symbols you care about, but you don't mention at all that these two may alias other symbols which might be legal to reference from a livepatch.
I'm having a hard time understanding why a livepatch would want to reference those, or any symbol in the .init sections for that matter. __init_{begin,end} are exclusively used to unmap the init region after boot. What's the point in livepatch referencing data that's no longer there? The only application I would think of is to calculate some kind of offsets, but that would better be done using other symbols instead.
Quoted 2 lines
Please bear with me, it would be easier for me to understand if you could provide a concrete example.
The issue is that you do comparison by address, not by name. Let's assume that .rodata ends exactly where .init.* starts. Then
&__init_begin==&_erodata==&__2M_rodata_end. Access to the latter two symbols wants to be permitted; only__init_beginand whatever ends up being the very first symbol in .init.* ought to not be referenced.Quoted 6 lines
Quoted 2 lines
Hm, I guess I could add comparison by name additionally, but it looks fragile to me.
It looks fragile, yes. Thing is that you're trying to deal with this when crucial information was lost already. Or wait - isn't the section number still available in ->st_shndx?
But that's the section number of the to be resolved symbol? In the livepatch payload it would for example appear as:
Quoted 7 lines
0000000000000000 F *UND* 0000000000000000 .hidden
setup_boot_APIC_clockWith undefined section.
It's possible I'm not following, is there a way to get the section number of the current Xen symbols, and then correlate it with the .init section?
Hmm, yes, looks like I was forgetting that livepatch resolves symbols using kallsyms data, not Xen's ELF symbol table.
Jan