<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/simtrace2/+/19527">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  fixeria: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">firmware: fix builds with gcc stack smashing protection enabled<br><br>On Ubuntu 20.04 when builiding dpkg packages, even when cross-compiling<br>firmware, gcc stack smashing protection is enabled.  Let's provide what<br>is minimally required in order to sucessfully complete builds on such<br>platforms.<br><br>Change-Id: Ic2f68f16b0730e7b5db17c30effc29a2909d1997<br>Closes: OS#4687<br>---<br>M firmware/Makefile<br>A firmware/libcommon/source/stack_check.c<br>2 files changed, 15 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/Makefile b/firmware/Makefile</span><br><span>index bdca6e5..7be5c30 100644</span><br><span>--- a/firmware/Makefile</span><br><span>+++ b/firmware/Makefile</span><br><span>@@ -100,7 +100,7 @@</span><br><span> C_LIBUSB_RT  = dfu.c dfu_runtime.c</span><br><span> C_LIBUSB_DFU = dfu.c dfu_desc.c dfu_driver.c</span><br><span> C_LIBCOMMON  = string.c stdio.c fputs.c usb_buf.c ringbuffer.c pseudo_talloc.c host_communication.c \</span><br><span style="color: hsl(0, 100%, 40%);">-              main_common.c</span><br><span style="color: hsl(120, 100%, 40%);">+         main_common.c stack_check.c</span><br><span> </span><br><span> C_BOARD      = $(notdir $(wildcard libboard/common/source/*.c))</span><br><span> C_BOARD     += $(notdir $(wildcard libboard/$(BOARD)/source/*.c))</span><br><span>diff --git a/firmware/libcommon/source/stack_check.c b/firmware/libcommon/source/stack_check.c</span><br><span>new file mode 100644</span><br><span>index 0000000..3130dd8</span><br><span>--- /dev/null</span><br><span>+++ b/firmware/libcommon/source/stack_check.c</span><br><span>@@ -0,0 +1,14 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#include <stdint.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/panic.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* This is what's minimally required to fix builds on Ubuntu 20.04,</span><br><span style="color: hsl(120, 100%, 40%);">+ * where stack smashing protection is enabled by default when using dpkg</span><br><span style="color: hsl(120, 100%, 40%);">+ * - even when cross-compiling: https://osmocom.org/issues/4687</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+uintptr_t __stack_chk_guard = 0xdeadbeef;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void __stack_chk_fail(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+        osmo_panic("Stack smashing detected!\r\n");</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/simtrace2/+/19527">change 19527</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/simtrace2/+/19527"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: simtrace2 </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ic2f68f16b0730e7b5db17c30effc29a2909d1997 </div>
<div style="display:none"> Gerrit-Change-Number: 19527 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>