Merge "Improve security by avoiding buffer overflows"

This commit is contained in:
Zuul 2019-01-09 21:55:59 +00:00 committed by Gerrit Code Review
commit 4a1f5fb034
5 changed files with 13 additions and 12 deletions

View File

@ -1,7 +1,7 @@
#
# BSD LICENSE
#
# Copyright(c) 2013-2016, Wind River Systems, Inc.
# Copyright(c) 2013-2016, Wind River Systems, Inc.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@ -34,7 +34,7 @@
EXECS = guest_scale_helper guest_scale_agent
CFLAGS= -g -Wall
CFLAGS= -g -Wall -Wformat -Wformat-security
ODIR=obj
BINDIR=bin
@ -64,7 +64,7 @@ printvars:
.PHONY: printvars
all: host_all
all: host_all
host_all: $(BINEXECS) sdk/$(EXPORT_SDK).tgz
# The dependency tracking for the SDK tarball is rather crude. If any

View File

@ -1,5 +1,5 @@
#
# Copyright(c) 2013-2016, Wind River Systems, Inc.
# Copyright(c) 2013-2016, Wind River Systems, Inc.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@ -66,6 +66,7 @@ program_BUILD_OBJS := $(addprefix $(BUILD_DIR)/, $(heartbeat_C_OBJS))
program_BUILD_OBJS += $(addprefix $(BUILD_DIR)/, $(program_C_OBJS))
CFLAGS = -g -O2 -Wall -Werror -Wformat -DSYSCONFDIR=$(sysconfdir)
CFLAGS += -Wformat-security
all: build

View File

@ -1,5 +1,5 @@
#
# Copyright(c) 2013-2016, Wind River Systems, Inc.
# Copyright(c) 2013-2016, Wind River Systems, Inc.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@ -54,7 +54,7 @@ heartbeat_C_INCLUDES += -I$(CURRENT_DIR)/../../../include
heartbeat_C_SRCS := $(wildcard *.c)
heartbeat_C_OBJS := ${heartbeat_C_SRCS:.c=.o}
CFLAGS = -g -O2 -Wall -Werror -Wformat -DSYSCONFDIR=$(sysconfdir)
CFLAGS = -g -O2 -Wall -Werror -Wformat -DSYSCONFDIR=$(sysconfdir) -Wformat-security
%.o: %.c
$(CC) $(CFLAGS) $(heartbeat_C_INCLUDES) -c $< -o $(BUILD_DIR)/$@ -ljson-c

View File

@ -1,5 +1,5 @@
#
# Copyright(c) 2013-2016, Wind River Systems, Inc.
# Copyright(c) 2013-2016, Wind River Systems, Inc.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@ -72,7 +72,7 @@ sample_C_OBJS := ${sample_C_SRCS:.c=.o}
sample_LDLIBS := -L$(BUILD_DIR) -l$(common_NAME) -l$(heartbeat_NAME) -lrt
sample_BUILD_OBJS := $(addprefix $(BUILD_DIR)/, $(sample_C_OBJS))
CFLAGS = -g -O2 -Wall -Werror -Wformat -fPIC -DSYSCONFDIR=$(sysconfdir)
CFLAGS = -g -O2 -Wall -Werror -Wformat -fPIC -DSYSCONFDIR=$(sysconfdir) -Wformat-security
all: build

View File

@ -27,14 +27,14 @@
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
#
.PHONY: all clean
EXECS= guest_agent server_group_app
CFLAGS= -g -Wall
LDFLAGS =
CFLAGS= -g -Wall -Wformat -Wformat-security
LDFLAGS =
ODIR=obj
BINDIR=bin
@ -51,7 +51,7 @@ GUEST_CLIENT_APP_SRCS = server_group_app.c
GUEST_CLIENT_APP_OBJ := $(patsubst %,$(ODIR)/%,$(GUEST_CLIENT_APP_SRCS:.c=.o))
LIBGUESTHOSTMSG_SRCS := lib_guest_host_msg.c
LIBGUESTHOSTMSG_INCLUDES := guest_host_msg.h
LIBGUESTHOSTMSG_INCLUDES := guest_host_msg.h
LIBGUESTHOSTMSG_OBJ := $(patsubst %,$(ODIR)/%,$(LIBGUESTHOSTMSG_SRCS:.c=.o))
LIBGUESTHOSTMSG := guesthostmsg
LIBGUESTHOSTMSG_SO := $(patsubst %,lib%.so,$(LIBGUESTHOSTMSG))