lxc: fix missing include for va_list

PATCH New Fabrice Fontaine 3 participants 6 messages Dec 4, 2018 – Dec 9, 2018

lore

Share & tools

lore

Fabrice Fontaine

author

2018-12-04 20:15 UTC #0 lore raw

PATCH v3 1/2 lxc: fix missing include for va_list

Fixes:
- http://autobuild.buildroot.org/results/0b90e7dca2984652842832a41abad93ac49a9b86

Signed-off-by Fabrice Fontaine <[email protected]>

---
 ...01-stringutils-include-stdarg-for-va_list.patch | 30 ++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 package/lxc/0001-stringutils-include-stdarg-for-va_list.patch

package/lxc/0001-stringutils-include-stdarg-for-va_list.patch new file +30 -0

new file mode 100644
index 0000000000..d0a450e8cf
@@ -0,0 +1,30 @@
+From b7df06ad14c04f18b7db5b64d5142b802bf64cb2 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <[email protected]>
+Date: Mon, 3 Dec 2018 22:18:16 +0100
+Subject: [PATCH] stringutils: include stdarg for va_list
+
+Fixes:
+ - http://autobuild.buildroot.org/results/0b90e7dca2984652842832a41abad93ac49a9b86
+
+Signed-off-by: Fabrice Fontaine <[email protected]>
+[Upstream status: https://github.com/lxc/lxc/pull/2745]
+---
+ src/lxc/string_utils.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/lxc/string_utils.h b/src/lxc/string_utils.h
+index 4065e4e6..d4e633cc 100644
+--- a/src/lxc/string_utils.h
++++ b/src/lxc/string_utils.h
+@@ -20,6 +20,8 @@
+ #ifndef __LXC_STRING_UTILS_H
+ #define __LXC_STRING_UTILS_H
+ 
++#include <stdarg.h>
++
+ #include "config.h"
+ 
+ #include "initutils.h"
+-- 
+2.14.1
+

Signature · 1 line

2.14.1

Fabrice Fontaine

author

2018-12-04 20:15 UTC #1 lore raw

PATCH v3 2/2 lxc: fix build without stack protector

Stack protector has been added in version 3.0.3 by
https://github.com/lxc/lxc/commit/2268c27754152aa538db2c9e3753d72d19bcd17a

However, some compilers could missed the needed library (-lssp or -lssp_nonshared) at linking step so use ax_check_link_flag instead of ax_check_compile_flag

Fixes:
- http://autobuild.buildroot.org/results/0b90e7dca2984652842832a41abad93ac49a9b86

Signed-off-by Fabrice Fontaine <[email protected]>

---
Changes v2 -> v3 (after review of Baruch Siach):
- Add patch to use ac_check_link_flag

Changes v1 -> v2 (after review of Thomas Petazzoni):
- Drop patch to add a new option, instead use ax_cv_check_cflags__Werror__fstack_protector_strong=no

 ...gure.ac-fix-build-without-stack-protector.patch | 37 ++++++++++++++++++++++
 package/lxc/lxc.mk                                 |  2 ++
 2 files changed, 39 insertions(+)
 create mode 100644 package/lxc/0002-configure.ac-fix-build-without-stack-protector.patch

package/lxc/0002-configure.ac-fix-build-without-stack-protector.patch new file +37 -0

new file mode 100644
index 0000000000..744fcbbed3
@@ -0,0 +1,37 @@
+From 3aa7271157d3c815a4426c1f8eaea2f3b6dafa6a Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <[email protected]>
+Date: Tue, 4 Dec 2018 08:40:05 +0100
+Subject: [PATCH] configure.ac: fix build without stack-protector
+
+Compiler based hardening (including -fstack-protector-strong) are
+enabled since version 3.0.3 and
+https://github.com/lxc/lxc/commit/2268c27754152aa538db2c9e3753d72d19bcd17a
+
+However, some compilers could missed the needed library (-lssp or
+-lssp_nonshared) at linking step so use ax_check_link_flag instead of
+ax_check_compile_flag
+
+Fixes:
+ - http://autobuild.buildroot.org/results/0b90e7dca2984652842832a41abad93ac49a9b86
+
+Signed-off-by: Fabrice Fontaine <[email protected]>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9a9adac3..032e4cfd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -696,7 +696,7 @@ AX_CHECK_COMPILE_FLAG([-Wcast-align], [CFLAGS="$CFLAGS -Wcast-align"],,[-Werror]
+ AX_CHECK_COMPILE_FLAG([-Wstrict-prototypes], [CFLAGS="$CFLAGS -Wstrict-prototypes"],,[-Werror])
+ AX_CHECK_COMPILE_FLAG([-fno-strict-aliasing], [CFLAGS="$CFLAGS -fno-strict-aliasing"],,[-Werror])
+ AX_CHECK_COMPILE_FLAG([-fstack-clash-protection], [CFLAGS="$CFLAGS -fstack-clash-protection"],,[-Werror])
+-AX_CHECK_COMPILE_FLAG([-fstack-protector-strong], [CFLAGS="$CFLAGS -fstack-protector-strong"],,[-Werror])
++AX_CHECK_LINK_FLAG([-fstack-protector-strong], [CFLAGS="$CFLAGS -fstack-protector-strong"],,[-Werror])
+ AX_CHECK_COMPILE_FLAG([-g], [CFLAGS="$CFLAGS -g"],,[-Werror])
+ AX_CHECK_COMPILE_FLAG([--mcet -fcf-protection], [CFLAGS="$CFLAGS --mcet -fcf-protection"],,[-Werror])
+ AX_CHECK_COMPILE_FLAG([-Werror=implicit-function-declaration], [CFLAGS="$CFLAGS -Werror=implicit-function-declaration"],,[-Werror])
+-- 
+2.14.1
+

package/lxc/lxc.mk +2 -0

index 48d5b20329..c9838fb229 100644
@@ -10,6 +10,8 @@ LXC_LICENSE = LGPL-2.1+
 LXC_LICENSE_FILES = COPYING
 LXC_DEPENDENCIES = host-pkgconf
 LXC_INSTALL_STAGING = YES
+# We're patching configure.ac
+LXC_AUTORECONF = YES
 
 LXC_CONF_OPTS = --disable-apparmor --with-distro=buildroot \
 	--disable-werror \

Signature · 1 line

2.14.1

Thomas Petazzoni

Applied

2018-12-06 20:20 UTC #2 lore raw

PATCH v3 2/2 lxc: fix build without stack protector

Hello,

Quoted 7 lines · Fabrice Fontaine

Stack protector has been added in version 3.0.3 by
https://github.com/lxc/lxc/commit/2268c27754152aa538db2c9e3753d72d19bcd17a
However, some compilers could missed the needed library (-lssp or -lssp_nonshared) at linking step so use ax_check_link_flag instead of ax_check_compile_flag

Quoted 7 lines

Fixes:
- http://autobuild.buildroot.org/results/0b90e7dca2984652842832a41abad93ac49a9b86
Signed-off-by Fabrice Fontaine <[email protected]>
---
Changes v2 -> v3 (after review of Baruch Siach):
- Add patch to use ac_check_link_flag

Applied to master, thanks. I think you could submit upstream, it's a fix that makes sense to have.

Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Peter Korsgaard

2018-12-09 21:37 UTC #3 lore raw

PATCH v3 2/2 lxc: fix build without stack protector

In reply to Fabrice Fontaine

Quoted 12 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
Stack protector has been added in version 3.0.3 by
https://github.com/lxc/lxc/commit/2268c27754152aa538db2c9e3753d72d19bcd17a
However, some compilers could missed the needed library (-lssp or -lssp_nonshared) at linking step so use ax_check_link_flag instead of ax_check_compile_flag
Fixes:
- http://autobuild.buildroot.org/results/0b90e7dca2984652842832a41abad93ac49a9b86

Quoted 8 lines

Signed-off-by Fabrice Fontaine <[email protected]>
---
Changes v2 -> v3 (after review of Baruch Siach):
- Add patch to use ac_check_link_flag
Changes v1 -> v2 (after review of Thomas Petazzoni):
- Drop patch to add a new option, instead use ax_cv_check_cflags__Werror__fstack_protector_strong=no

Committed to 2018.11.x, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Thomas Petazzoni

Applied

2018-12-06 20:19 UTC #4 lore raw

PATCH v3 1/2 lxc: fix missing include for va_list

In reply to Fabrice Fontaine

Hello,

Quoted 8 lines · Fabrice Fontaine

Fixes:
- http://autobuild.buildroot.org/results/0b90e7dca2984652842832a41abad93ac49a9b86
Signed-off-by Fabrice Fontaine <[email protected]>
---
 ...01-stringutils-include-stdarg-for-va_list.patch | 30 ++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 package/lxc/0001-stringutils-include-stdarg-for-va_list.patch

Applied to master after updating the upstream status of the patch, since it was applied. Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Peter Korsgaard

2018-12-09 21:37 UTC #5 lore raw

PATCH v3 1/2 lxc: fix missing include for va_list

In reply to Fabrice Fontaine

Quoted 6 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
Fixes:
- http://autobuild.buildroot.org/results/0b90e7dca2984652842832a41abad93ac49a9b86
Signed-off-by Fabrice Fontaine <[email protected]>

Committed to 2018.11.x, thanks.

Signature · 1 line

Bye, Peter Korsgaard