mirror of
https://github.com/openwrt/packages.git
synced 2025-12-21 21:24:31 +04:00
01338963f9
Including CVE fixes for: CVE-2024-12084 CVE-2024-12085 CVE-2024-12086 CVE-2024-12087 CVE-2024-12088 CVE-2024-12747 The patch list is based on rsync_3.2.7-1+deb12u2 from Debian. Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
From 9f86ddc9652247233f32b241a79d5aa4fb9d4afa Mon Sep 17 00:00:00 2001
|
|
From: Andrew Tridgell <andrew@tridgell.net>
|
|
Date: Tue, 26 Nov 2024 09:16:31 +1100
|
|
Subject: [PATCH] disallow ../ elements in relpath for secure_relative_open
|
|
|
|
---
|
|
syscall.c | 7 +++++++
|
|
1 file changed, 7 insertions(+)
|
|
|
|
--- a/syscall.c
|
|
+++ b/syscall.c
|
|
@@ -721,6 +721,8 @@ int do_open_nofollow(const char *pathnam
|
|
must be a relative path, and the relpath must not contain any
|
|
elements in the path which follow symlinks (ie. like O_NOFOLLOW, but
|
|
applies to all path components, not just the last component)
|
|
+
|
|
+ The relpath must also not contain any ../ elements in the path
|
|
*/
|
|
int secure_relative_open(const char *basedir, const char *relpath, int flags, mode_t mode)
|
|
{
|
|
@@ -729,6 +731,11 @@ int secure_relative_open(const char *bas
|
|
errno = EINVAL;
|
|
return -1;
|
|
}
|
|
+ if (strncmp(relpath, "../", 3) == 0 || strstr(relpath, "/../")) {
|
|
+ // no ../ elements allowed in the relpath
|
|
+ errno = EINVAL;
|
|
+ return -1;
|
|
+ }
|
|
|
|
#if !defined(O_NOFOLLOW) || !defined(O_DIRECTORY)
|
|
// really old system, all we can do is live with the risks
|