32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
From fab6b79b7724f0b636963be528483e3e946884aa Mon Sep 17 00:00:00 2001
|
|
From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
|
|
Date: Tue, 8 Dec 2020 21:32:09 +1300
|
|
Subject: [PATCH] CVE-2021-20277 ldb/attrib_handlers casefold: stay in bounds
|
|
|
|
For a string that had N spaces at the beginning, we would
|
|
try to move N bytes beyond the end of the string.
|
|
|
|
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14655
|
|
|
|
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
|
|
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
|
|
|
|
(cherry-picked from commit for master)
|
|
---
|
|
lib/ldb/common/attrib_handlers.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/lib/ldb/common/attrib_handlers.c b/lib/ldb/common/attrib_handlers.c
|
|
index b5212b731596..c6ef5ad477b0 100644
|
|
--- a/lib/ldb/common/attrib_handlers.c
|
|
+++ b/lib/ldb/common/attrib_handlers.c
|
|
@@ -76,7 +76,7 @@ int ldb_handler_fold(struct ldb_context *ldb, void *mem_ctx,
|
|
|
|
/* remove leading spaces if any */
|
|
if (*s == ' ') {
|
|
- for (t = s; *s == ' '; s++) ;
|
|
+ for (t = s; *s == ' '; s++, l--) ;
|
|
|
|
/* remove leading spaces by moving down the string */
|
|
memmove(t, s, l);
|