ubuntu: Add ASAN build

Build with `--build-var=CC=clang --build-var=ASAN=1`
The resulting binary doesn't work, something to do with IPC (the ubuntu-specific part), but it's a start.

cc @pimvanpelt

CL: ubuntu: Add ASAN build

PUBLISHED_FROM=bb637cfb36439c842337a52ef7a1e1ad5d06f8d2

Author: Deomid Ryabkov

fw/platforms/stm32/Makefile.build

@@ -244,11 +244,11 @@ C_CXX_FLAGS = -Os -ggdb -MD -Wall -Wextra -Werror -pipe \
               -DFW_ARCHITECTURE=$(APP_PLATFORM) \
               $(MGOS_CFLAGS) $(MGOS_FEATURES) \
               $(MG_FEATURES_TINY) -DMG_ENABLE_DIRECTORY_LISTING \
-              -DMG_NET_IF=$(MGOS_MG_NET_IF)
+              -DMG_NET_IF=$(MGOS_MG_NET_IF) \
+              $(STM32_CFLAGS)
 
-CFLAGS = -std=gnu99 $(C_CXX_FLAGS) $(STM32_CFLAGS) \
-         $(APP_CFLAGS)
-CXXFLAGS = -std=gnu++11 -fno-exceptions $(C_CXX_FLAGS) $(STM32_CFLAGS) $(APP_CXXFLAGS)
+CFLAGS = -std=gnu99 $(C_CXX_FLAGS) $(APP_CFLAGS)
+CXXFLAGS = -std=gnu++11 -fno-exceptions $(C_CXX_FLAGS) $(APP_CXXFLAGS)
 
 LDFLAGS += -Wl,--defsym=SRAM_BASE_ADDR=$(SRAM_BASE_ADDR) -Wl,--defsym=SRAM_SIZE=$(SRAM_SIZE) \
            -Wl,--defsym=SRAM2_BASE_ADDR=$(SRAM2_BASE_ADDR) -Wl,--defsym=SRAM2_SIZE=$(SRAM2_SIZE) \

fw/platforms/ubuntu/Makefile.build

@@ -18,13 +18,11 @@ BIN_DIR = build/bin
 GEN_DIR = $(BUILD_DIR)/gen
 FW_STAGING_DIR ?= $(BUILD_DIR)/fw_temp
 FW_DIR ?= $(CURDIR)/fw
-VERBOSE ?= 0
-SSL ?= None
-DEBUG ?= 0
-CC_WRAPPER ?=
 # Extra parts to include in firmware
 APP_EXTRA_FW_PARTS ?=
 
+ASAN ?= 0
+
 # Explicitly disable updater, it's not supported on POSIX build yet.
 MGOS_ENABLE_DEBUG_UDP = 0
 MGOS_ENABLE_BITBANG = 0
@@ -37,6 +35,7 @@ MGOS_POSIX_FEATURES ?= -DMGOS_PROMPT_DISABLE_ECHO -DMGOS_MAX_NUM_UARTS=2 \
 MONGOOSE_FEATURES = \
   -DMG_USE_READ_WRITE -DMG_ENABLE_THREADS -DMG_ENABLE_THREADS \
   -DMG_ENABLE_HTTP_STREAMING_MULTIPART -DMG_DISABLE_DAV \
+  -DMG_ENABLE_DIRECTORY_LISTING \
   -DMG_MODULE_LINES
 
 
@@ -51,18 +50,25 @@ MGOS_SRCS = $(notdir $(wildcard *.c)) mgos_init.c  \
 
 PLATFORM_SRCS = $(wildcard $(PLATFORM_VPATH)/*.c)
 
-CFLAGS ?= -std=gnu99 -fno-inline -W -Wall -Wundef -Werror -g -Wno-unused-function \
-          -Wno-missing-field-initializers \
-          -D_DEFAULT_SOURCE \
-          $(MGOS_FEATURES) $(MGOS_POSIX_FEATURES) \
-          $(MONGOOSE_FEATURES) \
-          -DMGOS_APP=\"$(APP)\" -DFW_ARCHITECTURE=$(APP_PLATFORM) \
-          $(APP_CFLAGS)
+C_CXX_FLAGS = -ggdb -MD -Wall -Wextra -Werror -pipe \
+              -ffunction-sections -fdata-sections \
+              -DMGOS_APP=\"$(APP)\" \
+              -DFW_ARCHITECTURE=$(APP_PLATFORM) \
+              $(MGOS_FEATURES) $(MGOS_POSIX_FEATURES) \
+              $(MONGOOSE_FEATURES)
+ifeq "$(ASAN)" "1"
+C_CXX_FLAGS += -fsanitize=address -fno-omit-frame-pointer
+LDFLAGS += -fsanitize=address
+else
+LDFLAGS += -static
+endif
+
+CFLAGS = -std=gnu99 $(C_CXX_FLAGS) $(APP_CFLAGS)
+CXXFLAGS = -std=gnu++11 -fno-exceptions $(C_CXX_FLAGS) $(APP_CXXFLAGS)
 
 INCDIRS = $(addprefix -I,$(INCLUDES))
 AR ?= ar
-LINKER ?= gcc
-LDFLAGS ?= -static
+LDFLAGS ?=
 APP_BIN_LIBS ?=
 LIBS  ?= pthread cap
 LDLIBS = $(addprefix -l,$(LIBS))
@@ -130,9 +136,9 @@ $(FS_STAGING_DIR): $(FS_FILES)
 # Objects of all sorts
 -include $(wildcard $(BUILD_DIR)/*.d)
 $(OBJS): $(BUILD_DIR)/%.o : %.c $(GENFILES_LIST)
-	$(Q) mkdir -p $(shell dirname $(OBJS))
-	$(vecho) "CC    $< -> $@"
-	$(Q) $(CC_WRAPPER) $(CC) -MD $(INCDIRS) $(CFLAGS) -c $< -o $@
+	$(vecho) "CC    $<"
+	$(Q) mkdir -p $(dir $@)
+	$(Q) $(CC) $(CFLAGS) $(INCDIRS) -c $< -o $@
 
 # lib.a, used during lib release build
 $(BUILD_DIR)/$(BUILD_LIB_NAME): $(BUILD_DIR) $(GENFILES_LIST) $(APP_OBJS)
@@ -142,7 +148,9 @@ $(BUILD_DIR)/$(BUILD_LIB_NAME): $(BUILD_DIR) $(GENFILES_LIST) $(APP_OBJS)
 # Application target.
 $(APP_BIN): $(BIN_DIR) $(OBJS)
 	$(vecho) "LD    $@"
-	$(Q) $(CC_WRAPPER) $(LINKER) -Wl,--start-group $(OBJS) $(APP_BIN_LIBS) $(LDLIBS) -Wl,--end-group $(LDFLAGS) -o $(BIN_DIR)/$(APP)
+	$(Q) $(CC) -Wl,--gc-sections -Wl,-Map=$@.map \
+	  -Wl,--start-group $(OBJS) $(APP_BIN_LIBS) $(LDLIBS) -Wl,--end-group \
+	  $(LDFLAGS) -o $(BIN_DIR)/$(APP)
 
 $(APP_ELF): $(APP_BIN)
 	$(Q) cp -v $(APP_BIN) $@

fw/platforms/ubuntu/sdk.version

@@ -1 +1 @@
-docker.io/mgos/ubuntu-build:bionic-r2
+docker.io/mgos/ubuntu-build:bionic-r3

fw/platforms/ubuntu/src/ubuntu_cap.c

@@ -71,7 +71,9 @@ bool ubuntu_cap_init(void) {
       LOGM(LL_ERROR, ("Cannot chroot to %s", Flags.chroot));
       return false;
     }
-    chdir("/");
+    if (chdir("/") != 0) {
+      return false;
+    }
     LOGM(LL_INFO, ("Setting chroot=%s", Flags.chroot));
   }
 

fw/platforms/ubuntu/src/ubuntu_gpio.c

@@ -50,7 +50,6 @@ static struct mgos_gpio_state *s_state = NULL;
 static int s_num_gpio_states = 0;
 struct mgos_rlock_type *s_lock = NULL;
 
-static void mgos_gpio_int_cb(void *arg);
 static void mgos_gpio_dbnc_done_cb(void *arg);
 
 static IRAM struct mgos_gpio_state *mgos_gpio_get_state(int pin) {
@@ -85,7 +84,7 @@ static struct mgos_gpio_state *mgos_gpio_get_or_create_state(int pin) {
 }
 
 /* In MGOS task context. */
-static void mgos_gpio_int_cb(void *arg) {
+void mgos_gpio_int_cb(void *arg) {
   int pin = (intptr_t) arg;
 
   mgos_rlock(s_lock);

fw/platforms/ubuntu/src/ubuntu_ipc_client.c

@@ -24,7 +24,7 @@ extern struct ubuntu_pipe s_pipe;
 
 static bool ubuntu_ipc_cmd(const struct ubuntu_pipe_message *in,
                            struct ubuntu_pipe_message *out) {
-  size_t _len;
+  ssize_t len;
   bool ret = false;
   struct msghdr msg;
   struct iovec iov[1];
@@ -40,19 +40,19 @@ static bool ubuntu_ipc_cmd(const struct ubuntu_pipe_message *in,
   msg.msg_iovlen = 1;
 
   mgos_rlock(s_pipe.lock);
-  _len = sendmsg(s_pipe.mongoose_fd, &msg, 0);
-  if (_len < 2) {
-    LOG(LL_ERROR, ("Cannot write message"));
+  len = sendmsg(s_pipe.mongoose_fd, &msg, 0);
+  if (len < 2) {
+    LOG(LL_ERROR, ("Cannot write message %d %d", (int) len, errno));
     goto exit;
   }
 
   iov[0].iov_base = (void *) out;
   iov[0].iov_len = sizeof(struct ubuntu_pipe_message);
   msg.msg_iov = iov;
   msg.msg_iovlen = 1;
-  _len = recvmsg(s_pipe.mongoose_fd, &msg, 0);
-  if (_len < 2) {
-    LOG(LL_ERROR, ("Cannot read message"));
+  len = recvmsg(s_pipe.mongoose_fd, &msg, 0);
+  if (len < 2) {
+    LOG(LL_ERROR, ("Cannot read message %d %d", (int) len, errno));
     goto exit;
   }
 
@@ -62,12 +62,12 @@ static bool ubuntu_ipc_cmd(const struct ubuntu_pipe_message *in,
 }
 
 int ubuntu_ipc_open(const char *pathname, int flags) {
-  size_t _len;
+  ssize_t len;
   struct msghdr msg;
   struct iovec iov[1];
   struct ubuntu_pipe_message iovec_payload;
 
-  union {
+  static union {
     struct cmsghdr cm;
     char control[CMSG_SPACE(sizeof(int))];
   } control_un;
@@ -94,9 +94,9 @@ int ubuntu_ipc_open(const char *pathname, int flags) {
   msg.msg_iovlen = 1;
 
   mgos_rlock(s_pipe.lock);
-  _len = sendmsg(s_pipe.mongoose_fd, &msg, 0);
-  if (_len < 2) {
-    LOG(LL_ERROR, ("Cannot write message"));
+  len = sendmsg(s_pipe.mongoose_fd, &msg, 0);
+  if (len < 2) {
+    LOG(LL_ERROR, ("Cannot write message %d", (int) len));
     goto exit;
   }
 
@@ -108,8 +108,8 @@ int ubuntu_ipc_open(const char *pathname, int flags) {
   msg.msg_control = control_un.control;
   msg.msg_controllen = sizeof(control_un.control);
 
-  _len = recvmsg(s_pipe.mongoose_fd, &msg, 0);
-  if (_len < 2) {
+  len = recvmsg(s_pipe.mongoose_fd, &msg, 0);
+  if (len < 2) {
     LOG(LL_ERROR, ("Cannot read message"));
     goto exit;
   }

fw/src/mgos_sys_config.c

@@ -97,7 +97,7 @@ static bool load_config_defaults_internal(struct mgos_config *cfg,
   int i;
   char fname[sizeof(CONF_USER_FILE) + 10];
   memset(cfg, 0, sizeof(*cfg));
-  memcpy(fname, CONF_USER_FILE, sizeof(fname));
+  memcpy(fname, CONF_USER_FILE, sizeof(CONF_USER_FILE));
   const char *acl = "*";
   for (i = 0; i < MGOS_CONFIG_LEVEL_USER; i++) {
     fname[CONF_USER_FILE_NUM_IDX] = '0' + i;

fw/src/mgos_time.c

@@ -15,13 +15,21 @@
  * limitations under the License.
  */
 
+#ifndef __TI_COMPILER_VERSION__
+#include <unistd.h>
+#endif
+
 #include "mgos.h"
 #include "mgos_event.h"
 #include "mgos_hal.h"
 #include "mgos_mongoose.h"
 
 #include "common/queue.h"
 
+#if defined(_DEFAULT_SOURCE) || defined(_BSD_SOURCE)
+#include <sys/time.h>
+#endif
+
 double mgos_uptime(void) {
   return mgos_uptime_micros() / 1000000.0;
 }

fw/tools/docker/ubuntu/Dockerfile-ubuntu-build

@@ -10,7 +10,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
     apt-get clean
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y -q \
-      libcap-dev && \
+      clang libcap-dev valgrind && \
     apt-get clean
 
 RUN useradd -d /opt -m -s /bin/bash user && chown -R user /opt