s390/crash: Use the correct type for memory allocation

Message ID 0756118c9058338f3040edb91971d0bfd100027b.1686688212.git.christophe.jaillet@wanadoo.fr
State New
Headers
Series s390/crash: Use the correct type for memory allocation |

Commit Message

Christophe JAILLET June 13, 2023, 8:30 p.m. UTC
  get_elfcorehdr_size() returns a size_t, so there is no real point to
store it in a u32.

Turn 'alloc_size' into a size_t.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
Not sure if 'alloc_size' can overflow in real life application, but using
the correct type looks harmless.

Should it be a real fix, either:
Fixes: 8cce437fbb5c ("s390/kdump: Fix elfcorehdr size calculation")
or
Fixes: 60a0c68df263 ("[S390] kdump backend code")
---
 arch/s390/kernel/crash_dump.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Alexander Gordeev June 14, 2023, 2:03 p.m. UTC | #1
On Tue, Jun 13, 2023 at 10:30:28PM +0200, Christophe JAILLET wrote:
> get_elfcorehdr_size() returns a size_t, so there is no real point to
> store it in a u32.
> 
> Turn 'alloc_size' into a size_t.
> 
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
> Not sure if 'alloc_size' can overflow in real life application, but using
> the correct type looks harmless.
> 
> Should it be a real fix, either:
> Fixes: 8cce437fbb5c ("s390/kdump: Fix elfcorehdr size calculation")
> or
> Fixes: 60a0c68df263 ("[S390] kdump backend code")
> ---
>  arch/s390/kernel/crash_dump.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/s390/kernel/crash_dump.c b/arch/s390/kernel/crash_dump.c
> index 8a617be28bb4..7af69948b290 100644
> --- a/arch/s390/kernel/crash_dump.c
> +++ b/arch/s390/kernel/crash_dump.c
> @@ -568,9 +568,9 @@ static size_t get_elfcorehdr_size(int mem_chunk_cnt)
>  int elfcorehdr_alloc(unsigned long long *addr, unsigned long long *size)
>  {
>  	Elf64_Phdr *phdr_notes, *phdr_loads;
> +	size_t alloc_size;
>  	int mem_chunk_cnt;
>  	void *ptr, *hdr;
> -	u32 alloc_size;
>  	u64 hdr_off;
>  
>  	/* If we are not in kdump or zfcp/nvme dump mode return */

Applied, thanks!
  

Patch

diff --git a/arch/s390/kernel/crash_dump.c b/arch/s390/kernel/crash_dump.c
index 8a617be28bb4..7af69948b290 100644
--- a/arch/s390/kernel/crash_dump.c
+++ b/arch/s390/kernel/crash_dump.c
@@ -568,9 +568,9 @@  static size_t get_elfcorehdr_size(int mem_chunk_cnt)
 int elfcorehdr_alloc(unsigned long long *addr, unsigned long long *size)
 {
 	Elf64_Phdr *phdr_notes, *phdr_loads;
+	size_t alloc_size;
 	int mem_chunk_cnt;
 	void *ptr, *hdr;
-	u32 alloc_size;
 	u64 hdr_off;
 
 	/* If we are not in kdump or zfcp/nvme dump mode return */