Rebase to the latest upstream v1.2.8
Resolves: RHEL-66219 Signed-off-by: Pavel Reichl <preichl@redhat.com>
This commit is contained in:
parent
dc8023ed06
commit
8596d013ad
1
.gitignore
vendored
1
.gitignore
vendored
@ -6,3 +6,4 @@
|
||||
/exfatprogs-1.2.0.tar.xz
|
||||
/exfatprogs-1.2.1.tar.xz
|
||||
/exfatprogs-1.2.2.tar.xz
|
||||
/exfatprogs-1.2.8.tar.xz
|
||||
|
@ -1,13 +1,11 @@
|
||||
Name: exfatprogs
|
||||
Version: 1.2.2
|
||||
Release: 6%{?dist}
|
||||
Version: 1.2.8
|
||||
Release: 1%{?dist}
|
||||
Summary: Userspace utilities for exFAT filesystems
|
||||
License: GPL-2.0-only
|
||||
URL: https://github.com/%{name}/%{name}
|
||||
|
||||
Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz
|
||||
Patch0: v1.2.3-exfat2img-fix-Missing-Initialization.patch
|
||||
Patch1: v1.2.3-tune-label-fix-USE_AFTER_FREE.patch
|
||||
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
@ -48,12 +46,16 @@ autoreconf -vif
|
||||
%{_mandir}/man8/tune.exfat.*
|
||||
|
||||
%changelog
|
||||
* Mon Mar 31 2025 Pavel Reichl <preichl@redhat.com> - 1.2.8-1
|
||||
- Rebase to the latest upstream version
|
||||
Related: RHEL-66219
|
||||
|
||||
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.2.2-6
|
||||
- Bump release for October 2024 mass rebuild:
|
||||
Resolves: RHEL-64018
|
||||
|
||||
* Mon Jul 01 2024 Pavel Reichl <preichl@redhat.com> - 1.2.2-5
|
||||
- Fox High impact true positive findings
|
||||
- Fix High impact true positive findings
|
||||
|
||||
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.2.2-4
|
||||
- Bump release for June 2024 mass rebuild
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (exfatprogs-1.2.2.tar.xz) = 51ff77860704a7a4a2986e0090514d46614d6d6ce5ad07ea622e4dd806f06f034959a0c35d7e67689a7eb6836a1de967e302d5ec1c9ca6d33fa80d68d574741e
|
||||
SHA512 (exfatprogs-1.2.8.tar.xz) = 5930555bde84d77b2b949a268cd0423abaf91bbc3b9632b66705f9e4a1245367c92515111a85f2846541cff7ac465197aed8b091d889dbf8309381ac2d41af98
|
||||
|
@ -1,29 +0,0 @@
|
||||
From 79b5b71cc6a1dbc45eeb63f53a6b51aa924309c8 Mon Sep 17 00:00:00 2001
|
||||
From: Pavel Reichl <preichl@redhat.com>
|
||||
Date: Mon, 13 Nov 2023 08:13:27 +0100
|
||||
Subject: [PATCH] exfat2img: fix Missing Initialization
|
||||
|
||||
exfatprogs-1.2.2/exfat2img/exfat2img.c:895: uninit_use: Using uninitialized value "ret".
|
||||
|
||||
Signed-off-by: Pavel Reichl <preichl@redhat.com>
|
||||
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
|
||||
---
|
||||
exfat2img/exfat2img.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/exfat2img/exfat2img.c b/exfat2img/exfat2img.c
|
||||
index 3f83588..f1a4ef2 100644
|
||||
--- a/exfat2img/exfat2img.c
|
||||
+++ b/exfat2img/exfat2img.c
|
||||
@@ -762,7 +762,7 @@ static ssize_t read_stream(int fd, void *buf, size_t len)
|
||||
|
||||
static int restore_from_stdin(struct exfat2img *ei)
|
||||
{
|
||||
- int in_fd, ret;
|
||||
+ int in_fd, ret = 0;
|
||||
unsigned char cc;
|
||||
unsigned int clu, end_clu;
|
||||
unsigned int cc_clu_count;
|
||||
--
|
||||
2.45.2
|
||||
|
@ -1,43 +0,0 @@
|
||||
From 8e4f2e671a154549d07ec45cb3c9cfe31b27b27f Mon Sep 17 00:00:00 2001
|
||||
From: Pavel Reichl <preichl@redhat.com>
|
||||
Date: Mon, 13 Nov 2023 08:37:06 +0100
|
||||
Subject: [PATCH] tune: label: fix USE_AFTER_FREE
|
||||
|
||||
double_free: Calling free frees pointer bs which has already been freed.
|
||||
|
||||
if exfat_alloc_exfat fails it already frees exfat->bs via exfat_free_exfat
|
||||
|
||||
Signed-off-by: Pavel Reichl <preichl@redhat.com>
|
||||
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
|
||||
---
|
||||
label/label.c | 1 -
|
||||
tune/tune.c | 1 -
|
||||
2 files changed, 2 deletions(-)
|
||||
|
||||
diff --git a/label/label.c b/label/label.c
|
||||
index 8cd5748..b110670 100644
|
||||
--- a/label/label.c
|
||||
+++ b/label/label.c
|
||||
@@ -105,7 +105,6 @@ int main(int argc, char *argv[])
|
||||
|
||||
exfat = exfat_alloc_exfat(&bd, bs);
|
||||
if (!exfat) {
|
||||
- free(bs);
|
||||
ret = -ENOMEM;
|
||||
goto close_fd_out;
|
||||
}
|
||||
diff --git a/tune/tune.c b/tune/tune.c
|
||||
index f883556..fdb8c94 100644
|
||||
--- a/tune/tune.c
|
||||
+++ b/tune/tune.c
|
||||
@@ -129,7 +129,6 @@ int main(int argc, char *argv[])
|
||||
|
||||
exfat = exfat_alloc_exfat(&bd, bs);
|
||||
if (!exfat) {
|
||||
- free(bs);
|
||||
ret = -ENOMEM;
|
||||
goto close_fd_out;
|
||||
}
|
||||
--
|
||||
2.45.2
|
||||
|
Loading…
Reference in New Issue
Block a user