Compare commits
No commits in common. "c8" and "c9-beta" have entirely different histories.
|
@ -1 +1 @@
|
||||||
f62f7900c32a5fec4e53a929eae5a9fd16bb3536 SOURCES/bubblewrap-0.4.0.tar.xz
|
00e121950ea494fcd9cfbe23971c0938d6be6755 SOURCES/bubblewrap-0.4.1.tar.xz
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
SOURCES/bubblewrap-0.4.0.tar.xz
|
SOURCES/bubblewrap-0.4.1.tar.xz
|
||||||
|
|
|
@ -0,0 +1,39 @@
|
||||||
|
From d70c640aecc30e9216dc1a614a207e85c8732036 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Colin Walters <walters@verbum.org>
|
||||||
|
Date: Thu, 27 May 2021 16:19:27 -0400
|
||||||
|
Subject: [PATCH] Avoid memory leak if --args is specified multiple times
|
||||||
|
|
||||||
|
Found by a static analyzer.
|
||||||
|
|
||||||
|
```
|
||||||
|
bubblewrap-0.4.1/bubblewrap.c:1500: overwrite_var: Overwriting "opt_args_data" in "opt_args_data = load_file_data(the_fd, &data_len)" leaks the storage that "opt_args_data" points to.
|
||||||
|
# 1498| * keep allocated until exit time, since its argv entries get used
|
||||||
|
# 1499| * by the other cases in parse_args_recurse() when we recurse. */
|
||||||
|
# 1500|-> opt_args_data = load_file_data (the_fd, &data_len);
|
||||||
|
# 1501| if (opt_args_data == NULL)
|
||||||
|
# 1502| die_with_error ("Can't read --args data");
|
||||||
|
```
|
||||||
|
---
|
||||||
|
bubblewrap.c | 6 ++++++
|
||||||
|
1 file changed, 6 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/bubblewrap.c b/bubblewrap.c
|
||||||
|
index 771e1ea..56ac07c 100644
|
||||||
|
--- a/bubblewrap.c
|
||||||
|
+++ b/bubblewrap.c
|
||||||
|
@@ -1494,6 +1494,12 @@ parse_args_recurse (int *argcp,
|
||||||
|
if (argv[1][0] == 0 || endptr[0] != 0 || the_fd < 0)
|
||||||
|
die ("Invalid fd: %s", argv[1]);
|
||||||
|
|
||||||
|
+ /* Specifying --args multiple times doesn't work; this just pacifies
|
||||||
|
+ * a static analyzer which pointed out the memory leak
|
||||||
|
+ */
|
||||||
|
+ if (opt_args_data != NULL)
|
||||||
|
+ free (opt_args_data);
|
||||||
|
+
|
||||||
|
/* opt_args_data is essentially a recursive argv array, which we must
|
||||||
|
* keep allocated until exit time, since its argv entries get used
|
||||||
|
* by the other cases in parse_args_recurse() when we recurse. */
|
||||||
|
--
|
||||||
|
2.31.1
|
||||||
|
|
|
@ -1,12 +1,13 @@
|
||||||
Name: bubblewrap
|
Name: bubblewrap
|
||||||
Version: 0.4.0
|
Version: 0.4.1
|
||||||
Release: 1%{?dist}
|
Release: 6%{?dist}
|
||||||
Summary: Core execution tool for unprivileged containers
|
Summary: Core execution tool for unprivileged containers
|
||||||
|
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
#VCS: git:https://github.com/projectatomic/bubblewrap
|
#VCS: git:https://github.com/projectatomic/bubblewrap
|
||||||
URL: https://github.com/projectatomic/bubblewrap
|
URL: https://github.com/projectatomic/bubblewrap
|
||||||
Source0: https://github.com/projectatomic/bubblewrap/releases/download/v%{version}/bubblewrap-%{version}.tar.xz
|
Source0: https://github.com/projectatomic/bubblewrap/releases/download/v%{version}/bubblewrap-%{version}.tar.xz
|
||||||
|
Patch0: 0001-Avoid-memory-leak-if-args-is-specified-multiple-time.patch
|
||||||
|
|
||||||
BuildRequires: autoconf automake libtool
|
BuildRequires: autoconf automake libtool
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
|
@ -14,6 +15,7 @@ BuildRequires: libcap-devel
|
||||||
BuildRequires: pkgconfig(libselinux)
|
BuildRequires: pkgconfig(libselinux)
|
||||||
BuildRequires: libxslt
|
BuildRequires: libxslt
|
||||||
BuildRequires: docbook-style-xsl
|
BuildRequires: docbook-style-xsl
|
||||||
|
BuildRequires: make
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Bubblewrap (/usr/bin/bwrap) is a core execution engine for unprivileged
|
Bubblewrap (/usr/bin/bwrap) is a core execution engine for unprivileged
|
||||||
|
@ -45,8 +47,45 @@ find %{buildroot} -name '*.la' -delete -print
|
||||||
%{_mandir}/man1/*
|
%{_mandir}/man1/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Jan 09 2020 David King <dking@redhat.com> - 0.4.0-1
|
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.4.1-6
|
||||||
- Rebase to 0.4.0 (#1788067)
|
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||||
|
Related: rhbz#1991688
|
||||||
|
|
||||||
|
* Thu May 27 2021 Colin Walters <walters@verbum.org> - 0.4.1-5
|
||||||
|
- Backport https://github.com/containers/bubblewrap/pull/426
|
||||||
|
|
||||||
|
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 0.4.1-4
|
||||||
|
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||||
|
|
||||||
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.1-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.1-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Mar 30 2020 David King <amigadave@amigadave.com> - 0.4.1-1
|
||||||
|
- Update to 0.4.1
|
||||||
|
|
||||||
|
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.0-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Nov 27 2019 Kalev Lember <klember@redhat.com> - 0.4.0-1
|
||||||
|
- Update to 0.4.0
|
||||||
|
|
||||||
|
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.3-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed May 01 2019 Colin Walters <walters@redhat.com> - 0.3.3-2
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.1-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Oct 01 2018 Kalev Lember <klember@redhat.com> - 0.3.1-1
|
||||||
|
- Update to 0.3.1
|
||||||
|
|
||||||
|
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.0-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
* Wed Jul 11 2018 Colin Walters <walters@verbum.org> - 0.3.0-1
|
* Wed Jul 11 2018 Colin Walters <walters@verbum.org> - 0.3.0-1
|
||||||
- https://github.com/projectatomic/bubblewrap/releases/tag/v0.3.0
|
- https://github.com/projectatomic/bubblewrap/releases/tag/v0.3.0
|
||||||
|
|
Loading…
Reference in New Issue