* [PATCH] efi: fix for_each_efi_memory_desc_in_map() for empty memmaps
@ 2016-05-25 14:36 ` Vitaly Kuznetsov
0 siblings, 0 replies; 6+ messages in thread
From: Vitaly Kuznetsov @ 2016-05-25 14:36 UTC (permalink / raw)
To: linux-efi; +Cc: linux-kernel, Matt Fleming, K. Y. Srinivasan
Commit 78ce248faa3c ("efi: Iterate over efi.memmap in
for_each_efi_memory_desc()") introduced a regression for systems booted
with 'noefi' kernel option. In particular, I observe early kernel hang in
efi_find_mirror() on for_each_efi_memory_desc() call. As we don't have
efi memmap we enter this iterator with the following parameters:
efi.memmap.map = 0, efi.memmap.map_end = 0, efi.memmap.desc_size = 28
for_each_efi_memory_desc_in_map() does the following comparison:
(md) <= (efi_memory_desc_t *)((m)->map_end - (m)->desc_size);
where md = 0, (m)->map_end = 0 and (m)->desc_size = 28 but when we subtract
something from a NULL pointer wrap around happens and we end up returning
invalid pointer.
Fixes: 78ce248faa3c ("efi: Iterate over efi.memmap in for_each_efi_memory_desc()")
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
---
include/linux/efi.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/linux/efi.h b/include/linux/efi.h
index c2db3ca..229ccb5 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -1005,7 +1005,8 @@ extern int efi_memattr_apply_permissions(struct mm_struct *mm,
/* Iterate through an efi_memory_map */
#define for_each_efi_memory_desc_in_map(m, md) \
for ((md) = (m)->map; \
- (md) <= (efi_memory_desc_t *)((m)->map_end - (m)->desc_size); \
+ (efi_memory_desc_t *)((md) + (m)->desc_size) <= \
+ (efi_memory_desc_t *)(m)->map_end; \
(md) = (void *)(md) + (m)->desc_size)
/**
--
2.5.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] efi: fix for_each_efi_memory_desc_in_map() for empty memmaps
@ 2016-05-25 14:36 ` Vitaly Kuznetsov
0 siblings, 0 replies; 6+ messages in thread
From: Vitaly Kuznetsov @ 2016-05-25 14:36 UTC (permalink / raw)
To: linux-efi-u79uwXL29TY76Z2rM5mHXA
Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA, Matt Fleming, K. Y. Srinivasan
Commit 78ce248faa3c ("efi: Iterate over efi.memmap in
for_each_efi_memory_desc()") introduced a regression for systems booted
with 'noefi' kernel option. In particular, I observe early kernel hang in
efi_find_mirror() on for_each_efi_memory_desc() call. As we don't have
efi memmap we enter this iterator with the following parameters:
efi.memmap.map = 0, efi.memmap.map_end = 0, efi.memmap.desc_size = 28
for_each_efi_memory_desc_in_map() does the following comparison:
(md) <= (efi_memory_desc_t *)((m)->map_end - (m)->desc_size);
where md = 0, (m)->map_end = 0 and (m)->desc_size = 28 but when we subtract
something from a NULL pointer wrap around happens and we end up returning
invalid pointer.
Fixes: 78ce248faa3c ("efi: Iterate over efi.memmap in for_each_efi_memory_desc()")
Signed-off-by: Vitaly Kuznetsov <vkuznets-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
include/linux/efi.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/linux/efi.h b/include/linux/efi.h
index c2db3ca..229ccb5 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -1005,7 +1005,8 @@ extern int efi_memattr_apply_permissions(struct mm_struct *mm,
/* Iterate through an efi_memory_map */
#define for_each_efi_memory_desc_in_map(m, md) \
for ((md) = (m)->map; \
- (md) <= (efi_memory_desc_t *)((m)->map_end - (m)->desc_size); \
+ (efi_memory_desc_t *)((md) + (m)->desc_size) <= \
+ (efi_memory_desc_t *)(m)->map_end; \
(md) = (void *)(md) + (m)->desc_size)
/**
--
2.5.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] efi: fix for_each_efi_memory_desc_in_map() for empty memmaps
@ 2016-05-25 20:48 ` Matt Fleming
0 siblings, 0 replies; 6+ messages in thread
From: Matt Fleming @ 2016-05-25 20:48 UTC (permalink / raw)
To: Vitaly Kuznetsov; +Cc: linux-efi, linux-kernel, K. Y. Srinivasan, Mark Salter
(Cc'ing Mark, the original author)
On Wed, 25 May, at 04:36:55PM, Vitaly Kuznetsov wrote:
> Commit 78ce248faa3c ("efi: Iterate over efi.memmap in
> for_each_efi_memory_desc()") introduced a regression for systems booted
> with 'noefi' kernel option. In particular, I observe early kernel hang in
> efi_find_mirror() on for_each_efi_memory_desc() call. As we don't have
> efi memmap we enter this iterator with the following parameters:
>
> efi.memmap.map = 0, efi.memmap.map_end = 0, efi.memmap.desc_size = 28
>
> for_each_efi_memory_desc_in_map() does the following comparison:
>
> (md) <= (efi_memory_desc_t *)((m)->map_end - (m)->desc_size);
>
> where md = 0, (m)->map_end = 0 and (m)->desc_size = 28 but when we subtract
> something from a NULL pointer wrap around happens and we end up returning
> invalid pointer.
>
> Fixes: 78ce248faa3c ("efi: Iterate over efi.memmap in for_each_efi_memory_desc()")
> Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
> ---
> include/linux/efi.h | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/include/linux/efi.h b/include/linux/efi.h
> index c2db3ca..229ccb5 100644
> --- a/include/linux/efi.h
> +++ b/include/linux/efi.h
> @@ -1005,7 +1005,8 @@ extern int efi_memattr_apply_permissions(struct mm_struct *mm,
> /* Iterate through an efi_memory_map */
> #define for_each_efi_memory_desc_in_map(m, md) \
> for ((md) = (m)->map; \
> - (md) <= (efi_memory_desc_t *)((m)->map_end - (m)->desc_size); \
> + (efi_memory_desc_t *)((md) + (m)->desc_size) <= \
> + (efi_memory_desc_t *)(m)->map_end; \
> (md) = (void *)(md) + (m)->desc_size)
Curse C type casting!
You're adding m->desc_size to a (efi_memory_desc_t *) which is 40
bytes. You need the below to avoid breaking regular EFI boot.
But yeah, this looks like a fine fix. Mark, any concerns?
---
diff --git a/include/linux/efi.h b/include/linux/efi.h
index d8ab480b1089..3a3f8d8bd9be 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -1026,7 +1026,7 @@ extern int efi_memattr_apply_permissions(struct mm_struct *mm,
/* Iterate through an efi_memory_map */
#define for_each_efi_memory_desc_in_map(m, md) \
for ((md) = (m)->map; \
- (md) <= (efi_memory_desc_t *)((m)->map_end - (m)->desc_size); \
+ ((void *)(md) + (m)->desc_size) <= (m)->map_end; \
(md) = (void *)(md) + (m)->desc_size)
/**
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] efi: fix for_each_efi_memory_desc_in_map() for empty memmaps
@ 2016-05-25 20:48 ` Matt Fleming
0 siblings, 0 replies; 6+ messages in thread
From: Matt Fleming @ 2016-05-25 20:48 UTC (permalink / raw)
To: Vitaly Kuznetsov
Cc: linux-efi-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, K. Y. Srinivasan,
Mark Salter
(Cc'ing Mark, the original author)
On Wed, 25 May, at 04:36:55PM, Vitaly Kuznetsov wrote:
> Commit 78ce248faa3c ("efi: Iterate over efi.memmap in
> for_each_efi_memory_desc()") introduced a regression for systems booted
> with 'noefi' kernel option. In particular, I observe early kernel hang in
> efi_find_mirror() on for_each_efi_memory_desc() call. As we don't have
> efi memmap we enter this iterator with the following parameters:
>
> efi.memmap.map = 0, efi.memmap.map_end = 0, efi.memmap.desc_size = 28
>
> for_each_efi_memory_desc_in_map() does the following comparison:
>
> (md) <= (efi_memory_desc_t *)((m)->map_end - (m)->desc_size);
>
> where md = 0, (m)->map_end = 0 and (m)->desc_size = 28 but when we subtract
> something from a NULL pointer wrap around happens and we end up returning
> invalid pointer.
>
> Fixes: 78ce248faa3c ("efi: Iterate over efi.memmap in for_each_efi_memory_desc()")
> Signed-off-by: Vitaly Kuznetsov <vkuznets-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> ---
> include/linux/efi.h | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/include/linux/efi.h b/include/linux/efi.h
> index c2db3ca..229ccb5 100644
> --- a/include/linux/efi.h
> +++ b/include/linux/efi.h
> @@ -1005,7 +1005,8 @@ extern int efi_memattr_apply_permissions(struct mm_struct *mm,
> /* Iterate through an efi_memory_map */
> #define for_each_efi_memory_desc_in_map(m, md) \
> for ((md) = (m)->map; \
> - (md) <= (efi_memory_desc_t *)((m)->map_end - (m)->desc_size); \
> + (efi_memory_desc_t *)((md) + (m)->desc_size) <= \
> + (efi_memory_desc_t *)(m)->map_end; \
> (md) = (void *)(md) + (m)->desc_size)
Curse C type casting!
You're adding m->desc_size to a (efi_memory_desc_t *) which is 40
bytes. You need the below to avoid breaking regular EFI boot.
But yeah, this looks like a fine fix. Mark, any concerns?
---
diff --git a/include/linux/efi.h b/include/linux/efi.h
index d8ab480b1089..3a3f8d8bd9be 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -1026,7 +1026,7 @@ extern int efi_memattr_apply_permissions(struct mm_struct *mm,
/* Iterate through an efi_memory_map */
#define for_each_efi_memory_desc_in_map(m, md) \
for ((md) = (m)->map; \
- (md) <= (efi_memory_desc_t *)((m)->map_end - (m)->desc_size); \
+ ((void *)(md) + (m)->desc_size) <= (m)->map_end; \
(md) = (void *)(md) + (m)->desc_size)
/**
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] efi: fix for_each_efi_memory_desc_in_map() for empty memmaps
@ 2016-05-25 21:00 ` Mark Salter
0 siblings, 0 replies; 6+ messages in thread
From: Mark Salter @ 2016-05-25 21:00 UTC (permalink / raw)
To: Matt Fleming, Vitaly Kuznetsov; +Cc: linux-efi, linux-kernel, K. Y. Srinivasan
On Wed, 2016-05-25 at 21:48 +0100, Matt Fleming wrote:
> (Cc'ing Mark, the original author)
>
> On Wed, 25 May, at 04:36:55PM, Vitaly Kuznetsov wrote:
> >
> > Commit 78ce248faa3c ("efi: Iterate over efi.memmap in
> > for_each_efi_memory_desc()") introduced a regression for systems booted
> > with 'noefi' kernel option. In particular, I observe early kernel hang in
> > efi_find_mirror() on for_each_efi_memory_desc() call. As we don't have
> > efi memmap we enter this iterator with the following parameters:
> >
> > efi.memmap.map = 0, efi.memmap.map_end = 0, efi.memmap.desc_size = 28
> >
> > for_each_efi_memory_desc_in_map() does the following comparison:
> >
> > (md) <= (efi_memory_desc_t *)((m)->map_end - (m)->desc_size);
> >
> > where md = 0, (m)->map_end = 0 and (m)->desc_size = 28 but when we subtract
> > something from a NULL pointer wrap around happens and we end up returning
> > invalid pointer.
> >
> > Fixes: 78ce248faa3c ("efi: Iterate over efi.memmap in for_each_efi_memory_desc()")
> > Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
> > ---
> > include/linux/efi.h | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/include/linux/efi.h b/include/linux/efi.h
> > index c2db3ca..229ccb5 100644
> > --- a/include/linux/efi.h
> > +++ b/include/linux/efi.h
> > @@ -1005,7 +1005,8 @@ extern int efi_memattr_apply_permissions(struct mm_struct *mm,
> > /* Iterate through an efi_memory_map */
> > #define for_each_efi_memory_desc_in_map(m, md) \
> > for ((md) = (m)->map; \
> > - (md) <= (efi_memory_desc_t *)((m)->map_end - (m)->desc_size); \
> > + (efi_memory_desc_t *)((md) + (m)->desc_size) <= \
> > + (efi_memory_desc_t *)(m)->map_end; \
> > (md) = (void *)(md) + (m)->desc_size)
> Curse C type casting!
>
> You're adding m->desc_size to a (efi_memory_desc_t *) which is 40
> bytes. You need the below to avoid breaking regular EFI boot.
>
> But yeah, this looks like a fine fix. Mark, any concerns?
No concerns. It looks like the right thing to do.
>
> ---
>
> diff --git a/include/linux/efi.h b/include/linux/efi.h
> index d8ab480b1089..3a3f8d8bd9be 100644
> --- a/include/linux/efi.h
> +++ b/include/linux/efi.h
> @@ -1026,7 +1026,7 @@ extern int efi_memattr_apply_permissions(struct mm_struct *mm,
> /* Iterate through an efi_memory_map */
> #define for_each_efi_memory_desc_in_map(m, md) \
> for ((md) = (m)->map; \
> - (md) <= (efi_memory_desc_t *)((m)->map_end - (m)->desc_size); \
> + ((void *)(md) + (m)->desc_size) <= (m)->map_end; \
> (md) = (void *)(md) + (m)->desc_size)
>
> /**
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] efi: fix for_each_efi_memory_desc_in_map() for empty memmaps
@ 2016-05-25 21:00 ` Mark Salter
0 siblings, 0 replies; 6+ messages in thread
From: Mark Salter @ 2016-05-25 21:00 UTC (permalink / raw)
To: Matt Fleming, Vitaly Kuznetsov
Cc: linux-efi-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, K. Y. Srinivasan
On Wed, 2016-05-25 at 21:48 +0100, Matt Fleming wrote:
> (Cc'ing Mark, the original author)
>
> On Wed, 25 May, at 04:36:55PM, Vitaly Kuznetsov wrote:
> >
> > Commit 78ce248faa3c ("efi: Iterate over efi.memmap in
> > for_each_efi_memory_desc()") introduced a regression for systems booted
> > with 'noefi' kernel option. In particular, I observe early kernel hang in
> > efi_find_mirror() on for_each_efi_memory_desc() call. As we don't have
> > efi memmap we enter this iterator with the following parameters:
> >
> > efi.memmap.map = 0, efi.memmap.map_end = 0, efi.memmap.desc_size = 28
> >
> > for_each_efi_memory_desc_in_map() does the following comparison:
> >
> > (md) <= (efi_memory_desc_t *)((m)->map_end - (m)->desc_size);
> >
> > where md = 0, (m)->map_end = 0 and (m)->desc_size = 28 but when we subtract
> > something from a NULL pointer wrap around happens and we end up returning
> > invalid pointer.
> >
> > Fixes: 78ce248faa3c ("efi: Iterate over efi.memmap in for_each_efi_memory_desc()")
> > Signed-off-by: Vitaly Kuznetsov <vkuznets-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> > ---
> > include/linux/efi.h | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/include/linux/efi.h b/include/linux/efi.h
> > index c2db3ca..229ccb5 100644
> > --- a/include/linux/efi.h
> > +++ b/include/linux/efi.h
> > @@ -1005,7 +1005,8 @@ extern int efi_memattr_apply_permissions(struct mm_struct *mm,
> > /* Iterate through an efi_memory_map */
> > #define for_each_efi_memory_desc_in_map(m, md) \
> > for ((md) = (m)->map; \
> > - (md) <= (efi_memory_desc_t *)((m)->map_end - (m)->desc_size); \
> > + (efi_memory_desc_t *)((md) + (m)->desc_size) <= \
> > + (efi_memory_desc_t *)(m)->map_end; \
> > (md) = (void *)(md) + (m)->desc_size)
> Curse C type casting!
>
> You're adding m->desc_size to a (efi_memory_desc_t *) which is 40
> bytes. You need the below to avoid breaking regular EFI boot.
>
> But yeah, this looks like a fine fix. Mark, any concerns?
No concerns. It looks like the right thing to do.
>
> ---
>
> diff --git a/include/linux/efi.h b/include/linux/efi.h
> index d8ab480b1089..3a3f8d8bd9be 100644
> --- a/include/linux/efi.h
> +++ b/include/linux/efi.h
> @@ -1026,7 +1026,7 @@ extern int efi_memattr_apply_permissions(struct mm_struct *mm,
> /* Iterate through an efi_memory_map */
> #define for_each_efi_memory_desc_in_map(m, md) \
> for ((md) = (m)->map; \
> - (md) <= (efi_memory_desc_t *)((m)->map_end - (m)->desc_size); \
> + ((void *)(md) + (m)->desc_size) <= (m)->map_end; \
> (md) = (void *)(md) + (m)->desc_size)
>
> /**
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-05-25 21:00 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-05-25 14:36 [PATCH] efi: fix for_each_efi_memory_desc_in_map() for empty memmaps Vitaly Kuznetsov
2016-05-25 14:36 ` Vitaly Kuznetsov
2016-05-25 20:48 ` Matt Fleming
2016-05-25 20:48 ` Matt Fleming
2016-05-25 21:00 ` Mark Salter
2016-05-25 21:00 ` Mark Salter
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.