!16 update to 1.12.1
From: @wangchen2020 Reviewed-by: @xiezhipeng1 Signed-off-by: @xiezhipeng1
This commit is contained in:
commit
3301ad2680
@ -1,50 +0,0 @@
|
||||
From 7daea2a2429a54dad68b1de9b37a5f65c5cf2600 Mon Sep 17 00:00:00 2001
|
||||
From: Jaroslav Rohel <jrohel@redhat.com>
|
||||
Date: Wed, 12 Aug 2020 08:35:28 +0200
|
||||
Subject: [PATCH] Validate path read from repomd.xml (RhBug:1868639)
|
||||
|
||||
= changelog =
|
||||
msg: Validate path read from repomd.xml
|
||||
type: security
|
||||
---
|
||||
librepo/yum.c | 17 +++++++++++++++++
|
||||
1 file changed, 17 insertions(+)
|
||||
|
||||
diff --git a/librepo/yum.c b/librepo/yum.c
|
||||
index 3059188..529257b 100644
|
||||
--- a/librepo/yum.c
|
||||
+++ b/librepo/yum.c
|
||||
@@ -23,6 +23,7 @@
|
||||
#define BITS_IN_BYTE 8
|
||||
|
||||
#include <stdio.h>
|
||||
+#include <libgen.h>
|
||||
#include <assert.h>
|
||||
#include <stdlib.h>
|
||||
#include <errno.h>
|
||||
@@ -770,6 +771,22 @@ prepare_repo_download_targets(LrHandle *handle,
|
||||
continue;
|
||||
|
||||
char *location_href = record->location_href;
|
||||
+
|
||||
+ char *dest_dir = realpath(handle->destdir, NULL);
|
||||
+ path = lr_pathconcat(handle->destdir, record->location_href, NULL);
|
||||
+ char *requested_dir = realpath(dirname(path), NULL);
|
||||
+ lr_free(path);
|
||||
+ if (!g_str_has_prefix(requested_dir, dest_dir)) {
|
||||
+ g_debug("%s: Invalid path: %s", __func__, location_href);
|
||||
+ g_set_error(err, LR_YUM_ERROR, LRE_IO, "Invalid path: %s", location_href);
|
||||
+ g_slist_free_full(*targets, (GDestroyNotify) lr_downloadtarget_free);
|
||||
+ free(requested_dir);
|
||||
+ free(dest_dir);
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+ free(requested_dir);
|
||||
+ free(dest_dir);
|
||||
+
|
||||
gboolean is_zchunk = FALSE;
|
||||
#ifdef WITH_ZCHUNK
|
||||
if (handle->cachedir && record->header_checksum)
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
Binary file not shown.
BIN
librepo-1.12.1.tar.gz
Normal file
BIN
librepo-1.12.1.tar.gz
Normal file
Binary file not shown.
@ -5,15 +5,13 @@
|
||||
%bcond_with zchunk
|
||||
|
||||
Name: librepo
|
||||
Version: 1.12.0
|
||||
Release: 2
|
||||
Version: 1.12.1
|
||||
Release: 1
|
||||
Summary: Repodata downloading library
|
||||
License: LGPLv2+
|
||||
URL: https://github.com/rpm-software-management/librepo
|
||||
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
|
||||
|
||||
Patch0: backport-CVE-2020-14352-Validate-path-read-from-repomd.xml.patch
|
||||
|
||||
BuildRequires: cmake check-devel doxygen pkgconfig(glib-2.0) gcc
|
||||
BuildRequires: libcurl-devel >= %{libcurl_version} pkgconfig(libxml-2.0)
|
||||
BuildRequires: pkgconfig(openssl) gpgme-devel libattr-devel pkgconfig(libcrypto)
|
||||
@ -80,6 +78,9 @@ popd
|
||||
%{python3_sitearch}/%{name}/
|
||||
|
||||
%changelog
|
||||
* Wed Jan 27 2021 wangchen <wangchen137@huawei.com> - 1.12.1-1
|
||||
- update to 1.12.1
|
||||
|
||||
* Mon Jan 25 2021 fuanan <fuanan3@huawei.com> - 1.12.0-2
|
||||
- fix CVE-2020-14352
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user