From 3e21c8da5cacb4a261d20301927c6ac52361d1e7 Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Wed, 29 Jun 2022 09:45:04 -0600 Subject: [PATCH] Add missing PVS Studio Open Source comments. Also avoid checking protobuf-c source and protobuf-c generated files. --- lib/eventlog/Makefile.in | 8 +++----- lib/fuzzstub/Makefile.in | 8 +++----- lib/iolog/Makefile.in | 8 +++----- lib/iolog/host_port.c | 5 +++++ lib/logsrv/Makefile.in | 9 +++------ lib/protobuf-c/Makefile.in | 9 +++------ lib/util/Makefile.in | 8 +++----- lib/util/getentropy.c | 5 +++++ lib/util/roundup.c | 5 +++++ logsrvd/iolog_writer.c | 5 +++++ logsrvd/logsrv_util.c | 5 +++++ logsrvd/logsrvd.c | 5 +++++ logsrvd/logsrvd_conf.c | 5 +++++ logsrvd/logsrvd_journal.c | 5 +++++ logsrvd/logsrvd_local.c | 5 +++++ logsrvd/logsrvd_queue.c | 5 +++++ logsrvd/logsrvd_relay.c | 5 +++++ logsrvd/sendlog.c | 5 +++++ logsrvd/tls_client.c | 5 +++++ logsrvd/tls_init.c | 5 +++++ plugins/sudoers/log_client.c | 5 +++++ src/Makefile.in | 2 +- src/apparmor.c | 5 +++++ 23 files changed, 99 insertions(+), 33 deletions(-) diff --git a/lib/eventlog/Makefile.in b/lib/eventlog/Makefile.in index 68fdcfc9e..84f8a5441 100644 --- a/lib/eventlog/Makefile.in +++ b/lib/eventlog/Makefile.in @@ -93,11 +93,6 @@ CHECK_WRAP_OBJS = check_wrap.lo logwrap.lo all: libsudo_eventlog.la -pvs-log-files: $(POBJS) - -pvs-studio: $(POBJS) - plog-converter $(PVS_LOG_OPTS) $(POBJS) - depend: $(scriptdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \ --builddir=$(abs_top_builddir) lib/eventlog/Makefile.in @@ -147,6 +142,9 @@ cppcheck: pvs-log-files: $(POBJS) +pvs-studio: $(POBJS) + plog-converter $(PVS_LOG_OPTS) $(POBJS) + fuzz: check-fuzzer: diff --git a/lib/fuzzstub/Makefile.in b/lib/fuzzstub/Makefile.in index 76baf2eb5..8c472b5cd 100644 --- a/lib/fuzzstub/Makefile.in +++ b/lib/fuzzstub/Makefile.in @@ -88,11 +88,6 @@ POBJS = $(IOBJS:.i=.plog) all: libsudo_fuzzstub.la -pvs-log-files: $(POBJS) - -pvs-studio: $(POBJS) - plog-converter $(PVS_LOG_OPTS) $(POBJS) - depend: $(scriptdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \ --builddir=$(abs_top_builddir) lib/fuzzstub/Makefile.in @@ -139,6 +134,9 @@ cppcheck: pvs-log-files: $(POBJS) +pvs-studio: $(POBJS) + plog-converter $(PVS_LOG_OPTS) $(POBJS) + fuzz: check-fuzzer: diff --git a/lib/iolog/Makefile.in b/lib/iolog/Makefile.in index 780a9c220..7ee93027b 100644 --- a/lib/iolog/Makefile.in +++ b/lib/iolog/Makefile.in @@ -140,11 +140,6 @@ FUZZ_IOLOG_TIMING_CORPUS = $(srcdir)/regress/corpus/seed/timing/timing.* all: libsudo_iolog.la -pvs-log-files: $(POBJS) - -pvs-studio: $(POBJS) - plog-converter $(PVS_LOG_OPTS) $(POBJS) - depend: $(scriptdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \ --builddir=$(abs_top_builddir) lib/iolog/Makefile.in @@ -305,6 +300,9 @@ cppcheck: pvs-log-files: $(POBJS) +pvs-studio: $(POBJS) + plog-converter $(PVS_LOG_OPTS) $(POBJS) + fuzz: run-fuzz_iolog_json run-fuzz_iolog_legacy run-fuzz_iolog_timing check-fuzzer: $(FUZZ_PROGS) diff --git a/lib/iolog/host_port.c b/lib/iolog/host_port.c index 01e5bd0b0..0622f4c44 100644 --- a/lib/iolog/host_port.c +++ b/lib/iolog/host_port.c @@ -16,6 +16,11 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/* + * This is an open source non-commercial project. Dear PVS-Studio, please check it. + * PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com + */ + #include #ifdef HAVE_STDBOOL_H diff --git a/lib/logsrv/Makefile.in b/lib/logsrv/Makefile.in index 119ebf05a..063680d68 100644 --- a/lib/logsrv/Makefile.in +++ b/lib/logsrv/Makefile.in @@ -86,11 +86,6 @@ GENERATED = log_server.pb-c.h log_server.pb-c.c all: liblogsrv.la -pvs-log-files: $(POBJS) - -pvs-studio: $(POBJS) - plog-converter $(PVS_LOG_OPTS) $(POBJS) - depend: $(scriptdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \ --builddir=$(abs_top_builddir) lib/logsrv/Makefile.in @@ -149,7 +144,9 @@ splint: cppcheck: cppcheck $(CPPCHECK_OPTS) -I$(incdir) -I$(top_builddir) -I$(top_srcdir) $(srcdir)/*.c -pvs-log-files: $(POBJS) +pvs-log-files: + +pvs-studio: fuzz: diff --git a/lib/protobuf-c/Makefile.in b/lib/protobuf-c/Makefile.in index 89846b4e4..0eb22d393 100644 --- a/lib/protobuf-c/Makefile.in +++ b/lib/protobuf-c/Makefile.in @@ -81,11 +81,6 @@ POBJS = $(IOBJS:.i=.plog) all: libprotobuf-c.la -pvs-log-files: $(POBJS) - -pvs-studio: $(POBJS) - plog-converter $(PVS_LOG_OPTS) $(POBJS) - depend: $(scriptdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \ --builddir=$(abs_top_builddir) lib/protobuf-c/Makefile.in @@ -144,7 +139,9 @@ splint: cppcheck: cppcheck $(CPPCHECK_OPTS) -I$(incdir) -I$(top_builddir) -I$(top_srcdir) $(srcdir)/*.c -pvs-log-files: $(POBJS) +pvs-log-files: + +pvs-studio: fuzz: diff --git a/lib/util/Makefile.in b/lib/util/Makefile.in index 856ee1e27..452f2f07b 100644 --- a/lib/util/Makefile.in +++ b/lib/util/Makefile.in @@ -197,11 +197,6 @@ FUZZ_SUDO_CONF_CORPUS = $(srcdir)/regress/corpus/seed/sudo_conf/sudo.conf.* all: libsudo_util.la -pvs-log-files: $(POBJS) - -pvs-studio: $(POBJS) - plog-converter $(PVS_LOG_OPTS) $(POBJS) - depend: siglist.c signame.c $(scriptdir)/mkdep.pl --srcdir=$(abs_top_srcdir) \ --builddir=$(abs_top_builddir) lib/util/Makefile.in @@ -395,6 +390,9 @@ cppcheck: pvs-log-files: $(POBJS) +pvs-studio: $(POBJS) + plog-converter $(PVS_LOG_OPTS) $(POBJS) + fuzz: run-fuzz_sudo_conf check-fuzzer: $(FUZZ_PROGS) diff --git a/lib/util/getentropy.c b/lib/util/getentropy.c index 056c12217..dc5c91c02 100644 --- a/lib/util/getentropy.c +++ b/lib/util/getentropy.c @@ -20,6 +20,11 @@ * http://man.openbsd.org/getentropy.2 */ +/* + * This is an open source non-commercial project. Dear PVS-Studio, please check it. + * PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com + */ + #include #ifndef HAVE_GETENTROPY diff --git a/lib/util/roundup.c b/lib/util/roundup.c index 27ef83a8b..0e7e8fdcd 100644 --- a/lib/util/roundup.c +++ b/lib/util/roundup.c @@ -16,6 +16,11 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/* + * This is an open source non-commercial project. Dear PVS-Studio, please check it. + * PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com + */ + #include #include "sudo_compat.h" diff --git a/logsrvd/iolog_writer.c b/logsrvd/iolog_writer.c index 411d35011..6fc57f969 100644 --- a/logsrvd/iolog_writer.c +++ b/logsrvd/iolog_writer.c @@ -16,6 +16,11 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/* + * This is an open source non-commercial project. Dear PVS-Studio, please check it. + * PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com + */ + #include #include diff --git a/logsrvd/logsrv_util.c b/logsrvd/logsrv_util.c index a72847d7e..b5493ef64 100644 --- a/logsrvd/logsrv_util.c +++ b/logsrvd/logsrv_util.c @@ -16,6 +16,11 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/* + * This is an open source non-commercial project. Dear PVS-Studio, please check it. + * PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com + */ + #include #include diff --git a/logsrvd/logsrvd.c b/logsrvd/logsrvd.c index 55e8c8df5..8911e2e63 100644 --- a/logsrvd/logsrvd.c +++ b/logsrvd/logsrvd.c @@ -16,6 +16,11 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/* + * This is an open source non-commercial project. Dear PVS-Studio, please check it. + * PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com + */ + #include #include diff --git a/logsrvd/logsrvd_conf.c b/logsrvd/logsrvd_conf.c index 1ac762b25..eea453c6d 100644 --- a/logsrvd/logsrvd_conf.c +++ b/logsrvd/logsrvd_conf.c @@ -16,6 +16,11 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/* + * This is an open source non-commercial project. Dear PVS-Studio, please check it. + * PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com + */ + #include #include diff --git a/logsrvd/logsrvd_journal.c b/logsrvd/logsrvd_journal.c index 43b9ae3eb..c9e804fe5 100644 --- a/logsrvd/logsrvd_journal.c +++ b/logsrvd/logsrvd_journal.c @@ -16,6 +16,11 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/* + * This is an open source non-commercial project. Dear PVS-Studio, please check it. + * PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com + */ + #include #include diff --git a/logsrvd/logsrvd_local.c b/logsrvd/logsrvd_local.c index a99f29f5e..2cbd5c82d 100644 --- a/logsrvd/logsrvd_local.c +++ b/logsrvd/logsrvd_local.c @@ -16,6 +16,11 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/* + * This is an open source non-commercial project. Dear PVS-Studio, please check it. + * PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com + */ + #include #include diff --git a/logsrvd/logsrvd_queue.c b/logsrvd/logsrvd_queue.c index 6db40fe64..5d5538354 100644 --- a/logsrvd/logsrvd_queue.c +++ b/logsrvd/logsrvd_queue.c @@ -16,6 +16,11 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/* + * This is an open source non-commercial project. Dear PVS-Studio, please check it. + * PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com + */ + #include #include diff --git a/logsrvd/logsrvd_relay.c b/logsrvd/logsrvd_relay.c index 7f82a0130..dc192888c 100644 --- a/logsrvd/logsrvd_relay.c +++ b/logsrvd/logsrvd_relay.c @@ -16,6 +16,11 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/* + * This is an open source non-commercial project. Dear PVS-Studio, please check it. + * PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com + */ + #include #include diff --git a/logsrvd/sendlog.c b/logsrvd/sendlog.c index 625719a14..0d1e37098 100644 --- a/logsrvd/sendlog.c +++ b/logsrvd/sendlog.c @@ -16,6 +16,11 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/* + * This is an open source non-commercial project. Dear PVS-Studio, please check it. + * PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com + */ + #include #include diff --git a/logsrvd/tls_client.c b/logsrvd/tls_client.c index ab7221862..405176a6e 100644 --- a/logsrvd/tls_client.c +++ b/logsrvd/tls_client.c @@ -16,6 +16,11 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/* + * This is an open source non-commercial project. Dear PVS-Studio, please check it. + * PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com + */ + #include #include diff --git a/logsrvd/tls_init.c b/logsrvd/tls_init.c index d88135a96..65cc8daa2 100644 --- a/logsrvd/tls_init.c +++ b/logsrvd/tls_init.c @@ -16,6 +16,11 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/* + * This is an open source non-commercial project. Dear PVS-Studio, please check it. + * PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com + */ + #include #ifdef HAVE_STDBOOL_H diff --git a/plugins/sudoers/log_client.c b/plugins/sudoers/log_client.c index 8fb6372cb..7a1fcc005 100644 --- a/plugins/sudoers/log_client.c +++ b/plugins/sudoers/log_client.c @@ -16,6 +16,11 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/* + * This is an open source non-commercial project. Dear PVS-Studio, please check it. + * PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com + */ + #include #ifdef SUDOERS_LOG_CLIENT diff --git a/src/Makefile.in b/src/Makefile.in index 74eea89b4..ba9804b14 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -146,7 +146,7 @@ OBJS = conversation.o copy_file.o edit_open.o env_hooks.o exec.o exec_common.o \ net_ifs.o parse_args.o preserve_fds.o signal.o sudo.o sudo_edit.o \ suspend_nopty.o tcsetpgrp_nobg.o tgetpass.o ttyname.o utmp.o @SUDO_OBJS@ -IOBJS = $(OBJS:.o=.i) sesh.i +IOBJS = $(OBJS:.o=.i) sesh.i sudo_intercept.i sudo_intercept_common.i POBJS = $(IOBJS:.i=.plog) diff --git a/src/apparmor.c b/src/apparmor.c index 5f36f3064..b7bd1a28a 100644 --- a/src/apparmor.c +++ b/src/apparmor.c @@ -16,6 +16,11 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/* + * This is an open source non-commercial project. Dear PVS-Studio, please check it. + * PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com + */ + #include #ifdef HAVE_APPARMOR