From: Christopher Faulet <cfaulet@haproxy.com>
Date: Thu, 18 Feb 2021 09:22:48 +0000 (+0100)
Subject: BUG/MINOR: sample: Always consider zero size string samples as unsafe
X-Git-Tag: v2.4-dev9~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8dd40fbde9d51cf7bf0ee622a5bc5c1f56048d84;p=thirdparty%2Fhaproxy.git

BUG/MINOR: sample: Always consider zero size string samples as unsafe

smp_is_safe() function is used to be sure a sample may be safely
modified. For string samples, a test is performed to verify if there is a
null-terminated byte. If not, one is added, if possible. It means if the
sample is not const and if there is some free space in the buffer, after
data. However, we must not try to read the null-terminated byte if the
string sample is too long (data >= size) or if the size is equal to
zero. This last test was not performed. Thus it was possible to consider a
string sample as safe by testing a byte outside the buffer.

Now, a zero size string sample is always considered as unsafe and is
duplicated when smp_make_safe() is called.

This patch must be backported in all stable versions.
---

diff --git a/include/haproxy/sample.h b/include/haproxy/sample.h
index 4a0561015f..e5378b03cd 100644
--- a/include/haproxy/sample.h
+++ b/include/haproxy/sample.h
@@ -97,13 +97,13 @@ int smp_is_safe(struct sample *smp)
 		/* Fall through */
 
 	case SMP_T_STR:
-		if (smp->data.u.str.size && smp->data.u.str.data >= smp->data.u.str.size)
+		if (!smp->data.u.str.size || smp->data.u.str.data >= smp->data.u.str.size)
 			return 0;
 
 		if (smp->data.u.str.area[smp->data.u.str.data] == 0)
 			return 1;
 
-		if (!smp->data.u.str.size || (smp->flags & SMP_F_CONST))
+		if (smp->flags & SMP_F_CONST)
 			return 0;
 
 		smp->data.u.str.area[smp->data.u.str.data] = 0;