From 3968ccd0cd021f8b9bcec86a589ced89e0b04205 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Wed, 5 May 2021 16:04:29 +0200
Subject: [PATCH] core: fix crash in BPFProgram parsing

Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=33270.
---
 src/core/load-fragment.c                |   2 +-
 test/fuzz/fuzz-unit-file/oss-fuzz-33270 | Bin 0 -> 6989 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 test/fuzz/fuzz-unit-file/oss-fuzz-33270

diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index 0fff986c74..2399089492 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 0000000000000000000000000000000000000000..84f1da44c580512800ea20b72936f1ac8459bbf6
GIT binary patch
literal 6989
zcmeHMTW`}a6z&5Ok|o4nfQJbQ*hNBu7yQt!REi)?phA0?CNRlaX4Q=+$6eL`%fH}Z
zoH+L-?NV4bHj<Y(ZXMg-`Od{(B2S(JIiAF~6Vew#E<X5&?m<N3hvy6MZJ0^597`Xt
zZ{UtxB?HA~RDpLfi-Nb+!GMFmMs%0-hj(?YUp5&C=}j%C@6F^q)I1DuS4r0pF1QCr
zz=JcLcYXop4_N3gxUbLB-bcMFe>zfJL+M|LLErQ8_v7Q|xzvo3tmT5@(w~55x+Z5#
z#pvR%*^7s8%H~2R;D3?}N-8}z4+$lfdu5jFMH9`Go}WV$jkwUDTo$kWBNxI(J0`6O
z4?-p=v02Ch@EylaCUbEq(Ol&KG@<gX0hOoIEy5DjX&N)F1x@$&_VzOam(fC-BZ<l2
zb;^dqS}7aeU&{t0i2*vHeBwN-{iQTjX5@6H1}ik+i<~v%kO(&Sl#Jx5ULq}c#C`}k
zl%ZBqJiet%<ZiM70?U+INWheI29sZxmzTyNZ^i^KDlw~XcwO?v4Sc-_i5=G-2-ohM
zXAjPMTOt}K)qL+xg-w`-lHeskVG<m1OiOX9$`X|2^x9lWRnkS-6;ZaOo#N7{l6)GH
zTo++Y;SfXhpQr8zMXITEyuMW}6*epp+f|y?mv+TqxfuK>8I{(I)$)5QN$k2r*Csqy
z>fh>_y~~ab*)hiamTA{;@Nad({obg=bVuB6oO;(Cad-D3fl^Uj6l<W@pD7GKjox%$
zi?5ey9J?a0{gtFLUe+YYE}Y#M-x7Uut9+|x(cEp<`PxbW`abRb{z*w2X`6*9bUQJ$
z7*LS{r`9|SKvRB1EC(V{m#=A)eoYz#>^j>}GQE?U4P&8Qy@2lM9eqMvYl!;%?LE=*
zTu;&%y?zC+TCI+cz!F1xob4*P<EF>)#=(4O$RT)k@Fs5;jb1NN=Vfkw65Bsr<oa7O
nawT!znGYXz<{0$x@X<scRfyC^L8iEgVzK2G1WcF@DU|#Md&~yi

literal 0
HcmV?d00001

-- 
2.25.1