dac09acc90
Resolves: RHEL-186226 - httpd: Apache HTTP Server: Heap-based Buffer Overflow via malicious backend servers (CVE-2026-34356) Resolves: RHEL-182580 - httpd: incomplete fix for CVE-2023-38709 (CVE-2024-42516) Resolves: RHEL-186187 - httpd: mod_proxy_html buffer handling vulnerability (CVE-2026-34355) Resolves: RHEL-175632 - httpd: mod_dav_lock uses wrong lock discovery (CVE-2026-29169) Resolves: RHEL-186189 - mod_xml2enc: fix bblen accounting in fix_skipto (CVE-2026-42536) Resolves: RHEL-186156 - httpd: fix OCSP write buffer advancement bug in mod_ssl (CVE-2026-44185) Resolves: RHEL-191249 - httpd: Apache HTTP Server: Out-of-bounds Read in mod_headers and mod_mime (CVE-2026-43951) Resolves: RHEL-193128 - httpd: Apache HTTP Server: Denial of Service in mod_proxy_ftp via attacker-controlled FTP server (CVE-2026-44186) Also addresses CVE-2026-24072, CVE-2026-33006, CVE-2026-42535, CVE-2026-44119
42 lines
1.6 KiB
Diff
42 lines
1.6 KiB
Diff
From 88d78fcdaa9e807540f98f94fac5254963081ec0 Mon Sep 17 00:00:00 2001
|
|
From: Eric Covener <covener@apache.org>
|
|
Date: Sun, 26 Apr 2026 16:04:35 +0000
|
|
Subject: [PATCH] Merge r1933353 from trunk:
|
|
|
|
mod_dav_lock: use the right dav_lock_discovery
|
|
|
|
|
|
|
|
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1933354 13f79535-47bb-0310-9956-ffa450edef68
|
|
---
|
|
modules/dav/lock/locks.c | 12 ++++++------
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/modules/dav/lock/locks.c b/modules/dav/lock/locks.c
|
|
index 0f072ec064..d357e4572d 100644
|
|
--- a/modules/dav/lock/locks.c
|
|
+++ b/modules/dav/lock/locks.c
|
|
@@ -1190,13 +1190,13 @@ static dav_error * dav_generic_refresh_locks(dav_lockdb *lockdb,
|
|
}
|
|
if (dav_generic_do_refresh(dp_scan, ltl, new_time)) {
|
|
/* the lock was refreshed. return the lock. */
|
|
- newlock = dav_generic_alloc_lock(lockdb, ip->key, dp->locktoken);
|
|
+ newlock = dav_generic_alloc_lock(lockdb, ip->key, dp_scan->locktoken);
|
|
newlock->is_locknull = !resource->exists;
|
|
- newlock->scope = dp->f.scope;
|
|
- newlock->type = dp->f.type;
|
|
- newlock->depth = dp->f.depth;
|
|
- newlock->timeout = dp->f.timeout;
|
|
- newlock->owner = dp->owner;
|
|
+ newlock->scope = dp_scan->f.scope;
|
|
+ newlock->type = dp_scan->f.type;
|
|
+ newlock->depth = dp_scan->f.depth;
|
|
+ newlock->timeout = dp_scan->f.timeout;
|
|
+ newlock->owner = dp_scan->owner;
|
|
newlock->auth_user = dp_scan->auth_user;
|
|
|
|
newlock->next = *locks;
|
|
--
|
|
2.52.0
|
|
|