From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 5 May 2021 14:04:29 +0000 (+0200)
Subject: core: fix crash in BPFProgram parsing
X-Git-Tag: v249-rc1~293^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3968ccd0cd021f8b9bcec86a589ced89e0b04205;p=thirdparty%2Fsystemd.git

core: fix crash in BPFProgram parsing

Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=33270.
---

diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index 0fff986c741..2399089492e 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -5600,7 +5600,7 @@ int config_parse_bpf_foreign_program(
         r = extract_first_word(&rvalue, &word, ":", 0);
         if (r == -ENOMEM)
                 return log_oom();
-        if (r <= 0) {
+        if (r <= 0 || isempty(rvalue)) {
                 log_syntax(unit, LOG_WARNING, filename, line, r, "Failed to parse foreign BPF program, ignoring: %s", rvalue);
                 return 0;
         }
diff --git a/test/fuzz/fuzz-unit-file/oss-fuzz-33270 b/test/fuzz/fuzz-unit-file/oss-fuzz-33270
new file mode 100644
index 00000000000..84f1da44c58
Binary files /dev/null and b/test/fuzz/fuzz-unit-file/oss-fuzz-33270 differ