diff mbox series

ELF: use __builtin_mul_overflow() more

Message ID dd85c092-379e-4d14-88f0-8f3910de9f7f@p183
State New
Headers
Series ELF: use __builtin_mul_overflow() more |

Commit Message

Alexey Dobriyan April 21, 2023, 6:54 p.m. UTC 
  __builtin_mul_overflow() can do multiplication and overflow check
in one line.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---

 fs/binfmt_elf.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Andrew Morton April 21, 2023, 7:39 p.m. UTC | #1 
On Fri, 21 Apr 2023 21:54:36 +0300 Alexey Dobriyan <adobriyan@gmail.com> wrote:

> __builtin_mul_overflow() can do multiplication and overflow check
> in one line.
> 
> --- a/fs/binfmt_elf.c
> +++ b/fs/binfmt_elf.c
> @@ -1651,9 +1651,8 @@ static int fill_files_note(struct memelfnote *note, struct coredump_params *cprm
>  
>  	/* *Estimated* file count and total data size needed */
>  	count = cprm->vma_count;
> -	if (count > UINT_MAX / 64)
> +	if (__builtin_mul_overflow(count, 64, &size))
>  		return -EINVAL;
> -	size = count * 64;

Huh, what the heck is that ;)


include/linux/overflow.h has check_mul_overflow() for us to use here.


tools/lib/bpf/libbpf_internal.h uses

	#if __has_builtin(__builtin_mul_overflow)

but check_mul_overflow() didn't bother testing for availability. 
Probably tools/lib/bpf/libbpf_internal.h should just use
check_mul_overflow().
Alexey Dobriyan April 22, 2023, 9:45 a.m. UTC | #2 
On Fri, Apr 21, 2023 at 12:39:11PM -0700, Andrew Morton wrote:
> On Fri, 21 Apr 2023 21:54:36 +0300 Alexey Dobriyan <adobriyan@gmail.com> wrote:
> 
> > __builtin_mul_overflow() can do multiplication and overflow check
> > in one line.
> > 
> > --- a/fs/binfmt_elf.c
> > +++ b/fs/binfmt_elf.c
> > @@ -1651,9 +1651,8 @@ static int fill_files_note(struct memelfnote *note, struct coredump_params *cprm
> >  
> >  	/* *Estimated* file count and total data size needed */
> >  	count = cprm->vma_count;
> > -	if (count > UINT_MAX / 64)
> > +	if (__builtin_mul_overflow(count, 64, &size))
> >  		return -EINVAL;
> > -	size = count * 64;
> 
> Huh, what the heck is that ;)
> 
> 
> include/linux/overflow.h has check_mul_overflow() for us to use here.

Oh, no, wrappers.

> tools/lib/bpf/libbpf_internal.h uses
> 
> 	#if __has_builtin(__builtin_mul_overflow)
> 
> but check_mul_overflow() didn't bother testing for availability. 

gcc 5.1 has __builtin_mul_overflow()

> Probably tools/lib/bpf/libbpf_internal.h should just use
> check_mul_overflow().

I don't know, this is userspace stuff.
diff mbox series

Patch

--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -1651,9 +1651,8 @@  static int fill_files_note(struct memelfnote *note, struct coredump_params *cprm
 
 	/* *Estimated* file count and total data size needed */
 	count = cprm->vma_count;
-	if (count > UINT_MAX / 64)
+	if (__builtin_mul_overflow(count, 64, &size))
 		return -EINVAL;
-	size = count * 64;
 
 	names_ofs = (2 + 3 * count) * sizeof(data[0]);
  alloc: