netdev - Re: [PATCH v2] lib: fix multiple strlcpy definition

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20170929115858.275217b8@xeon-e3>
Date:   Fri, 29 Sep 2017 11:58:58 -0700
From:   Stephen Hemminger <stephen@...workplumber.org>
To:     Baruch Siach <baruch@...s.co.il>
Cc:     netdev@...r.kernel.org, Phil Sutter <phil@....cc>
Subject: Re: [PATCH v2] lib: fix multiple strlcpy definition

On Thu, 28 Sep 2017 21:02:11 +0300
Baruch Siach <baruch@...s.co.il> wrote:

> Some C libraries, like uClibc and musl, provide BSD compatible
> strlcpy(). Add check_strlcpy() to configure, and avoid defining strlcpy
> and strlcat when the C library provides them.
> 
> This fixes the following static link error with uClibc-ng:
> 
> .../sysroot/usr/lib/libc.a(strlcpy.os): In function `strlcpy':
> strlcpy.c:(.text+0x0): multiple definition of `strlcpy'
> ../lib/libutil.a(utils.o):utils.c:(.text+0x1ddc): first defined here
> collect2: error: ld returned 1 exit status
> 
> Acked-by: Phil Sutter <phil@....cc>
> Signed-off-by: Baruch Siach <baruch@...s.co.il>

This is OK because it doesn't impact normal glibc too much.


> diff --git a/lib/Makefile b/lib/Makefile
> index 0fbdf4c31f50..132ad00c3335 100644
> --- a/lib/Makefile
> +++ b/lib/Makefile
> @@ -1,5 +1,9 @@
>  include ../config.mk
>  
> +ifeq ($(NEED_STRLCPY),y)
> +	CFLAGS += -DNEED_STRLCPY
> +endif
> +
>

I just removed all the conditional CFLAGS out of subdirectory Makefiles
and moved them into the generated config.mk. Please do that for this
as well and resubmit.