3 changed files with 116 additions and 24 deletions
--- a/.sysfsutils.metadata
+++ b/.sysfsutils.metadata
@ -1 +1 @@
-73f472c5ebc91c6288315f0fdefde0bbb1ef75e2 SOURCES/v2.1.1.tar.gz
+faa77ba9b0725027c4725f7bec26e91dd80e9c66 SOURCES/v2.1.1.tar.gz
--- a/SOURCES/sysfsutils-2.1.1-fix-memleaks-of-by-one-error.patch
+++ b/SOURCES/sysfsutils-2.1.1-fix-memleaks-of-by-one-error.patch
@ -0,0 +1,77 @@
+diff -up sysfsutils-2.1.1/lib/sysfs_attr.c.orig sysfsutils-2.1.1/lib/sysfs_attr.c
+--- sysfsutils-2.1.1/lib/sysfs_attr.c.orig	2024-07-29 13:45:04.415961682 +0200
+++ sysfsutils-2.1.1/lib/sysfs_attr.c	2024-07-29 13:52:54.927567946 +0200
+@@ -415,6 +415,7 @@ struct dlist *read_dir_links(const char
+ 					(SYSFS_NAME_LEN, sysfs_del_name);
+ 				if (!linklist) {
+ 					dbg_printf("Error creating list\n");
+					closedir(dir);
+ 					return NULL;
+ 				}
+ 			}
+@@ -470,6 +471,7 @@ struct sysfs_device *sysfs_read_dir_subd
+ 	dir = opendir(path);
+ 	if (!dir) {
+ 		dbg_printf("Error opening directory %s\n", path);
+		sysfs_close_device(dev);
+ 		return NULL;
+ 	}
+ 	while ((dirent = readdir(dir)) != NULL) {
+@@ -524,6 +526,7 @@ struct dlist *read_dir_subdirs(const cha
+ 					(SYSFS_NAME_LEN, sysfs_del_name);
+ 				if (!dirlist) {
+ 					dbg_printf("Error creating list\n");
+					closedir(dir);
+ 					return NULL;
+ 				}
+ 			}
+@@ -573,6 +576,7 @@ struct dlist *get_attributes_list(struct
+ 							sysfs_del_attribute);
+ 				if (!alist) {
+ 					dbg_printf("Error creating list\n");
+					closedir(dir);
+ 					return NULL;
+ 				}
+ 			}
+diff -up sysfsutils-2.1.1/lib/sysfs_device.c.orig sysfsutils-2.1.1/lib/sysfs_device.c
+--- sysfsutils-2.1.1/lib/sysfs_device.c.orig	2024-07-29 13:56:09.931819208 +0200
+++ sysfsutils-2.1.1/lib/sysfs_device.c	2024-07-29 14:00:07.958159026 +0200
+@@ -247,6 +247,7 @@ struct sysfs_device *sysfs_open_device_t
+ 			if (new == NULL) {
+ 				dbg_printf("Error opening device tree at %s\n",
+ 						cur->path);
+				sysfs_close_device(devlist);
+ 				sysfs_close_device_tree(rootdev);
+ 				return NULL;
+ 			}
+@@ -258,6 +259,7 @@ struct sysfs_device *sysfs_open_device_t
+ 		}
+ 	}
+ 
+	sysfs_close_device(devlist);
+ 	return rootdev;
+ }
+ 
+diff -up sysfsutils-2.1.1/lib/sysfs_driver.c.orig sysfsutils-2.1.1/lib/sysfs_driver.c
+--- sysfsutils-2.1.1/lib/sysfs_driver.c.orig	2021-02-19 10:49:00.000000000 +0100
+++ sysfsutils-2.1.1/lib/sysfs_driver.c	2024-07-29 13:43:43.461857368 +0200
+@@ -255,6 +255,7 @@ struct dlist *sysfs_get_driver_devices(s
+ 				if (!drv->devices) {
+ 					dbg_printf("Error creating device list\n");
+ 					sysfs_close_list(linklist);
+					sysfs_close_device(dev);
+ 					return NULL;
+ 				}
+ 			}
+diff -up sysfsutils-2.1.1/lib/sysfs_utils.c.orig sysfsutils-2.1.1/lib/sysfs_utils.c
+--- sysfsutils-2.1.1/lib/sysfs_utils.c.orig	2024-07-29 14:09:54.680028902 +0200
+++ sysfsutils-2.1.1/lib/sysfs_utils.c	2024-07-29 14:56:44.927888046 +0200
+@@ -151,7 +151,7 @@ int sysfs_get_link(const char *path, cha
+ 		return -1;
+ 	}
+ 
+-	count = readlink(path, linkpath, SYSFS_PATH_MAX);
+	count = readlink(path, linkpath, SYSFS_PATH_MAX - 1);
+ 	if (count < 0)
+ 		return -1;
+ 	else
--- a/SPECS/sysfsutils.spec
+++ b/SPECS/sysfsutils.spec
@ -4,18 +4,20 @@

 Name:           sysfsutils
 Version:        2.1.1
-Release:        10%{?dist}
+Release:        14%{?dist}
 Summary:        Utilities for interfacing with sysfs
 URL:            https://github.com/linux-ras/sysfsutils
-License:        GPLv2
+License:        GPL-2.0-only

 Source0:        https://github.com/linux-ras/sysfsutils/archive/v%{version}.tar.gz
+Patch0:         sysfsutils-2.1.1-fix-memleaks-of-by-one-error.patch

 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
 BuildRequires:  make
 BuildRequires:  gcc
+Requires:       libsysfs = %{version}-%{release}

 %description
 This package's purpose is to provide a set of utilities for interfacing
@ -23,14 +25,14 @@ with sysfs.

 %package -n libsysfs
 Summary: Shared library for interfacing with sysfs
-License: LGPLv2+
+License: LGPL-2.1-or-later

 %description -n libsysfs
 Library used in handling linux kernel sysfs mounts and their various files.

 %package -n libsysfs-devel
 Summary: Static library and headers for libsysfs
-License: LGPLv2+
+License: LGPL-2.1-or-later
 Requires: libsysfs = %{version}-%{release}

 %description -n libsysfs-devel
@ -71,33 +73,46 @@ find %{buildroot} -type f -name "*.la" -delete


 %changelog
-* Wed Jan 26 2022 Chris White <chwhite@redhat.com> - 2.1.1-10
- Rebuilding for RHEL9. Resolves rhbz#2043148
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.1.1-14
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Thu Aug 01 2024 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.1.1-13
+- Fix memory leaks and off-by-one error
+  Resolves: RHEL-42557
+
+* Wed Jul 24 2024 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.1.1-12
+- Rebuild
+
+* Wed Jul 24 2024 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.1.1-11
+- Bump release
+
+* Wed Jul 24 2024 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.1.1-10
+- Add explicit package version requirement for sysfsutils requiring libsysfs

-* Mon Aug 23 2021 Chris White <chwhite@redhat.com> - 2.1.1-
- Fixed tier0 test build process to work with 2.1.1. Resolves: rhbz#1975886
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.1.1-9
+- Bump release for June 2024 mass rebuild

-* Mon Aug 16 2021 Chris White <chwhite@redhat.com> - 2.1.1-8
- Renamed tests/tests.yaml to tests/test.yml. Resolves: rhbz#1975886
+* Thu May 09 2024 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.1.1-8
+- Update license tags to SPDX format

-* Mon Aug 16 2021 Chris White <chwhite@redhat.com> - 2.1.1-7
- Rebuilt with tier0 test cases. Resolves: rhbz#1975886
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

-* Thu Aug 12 2021 Chris White <chwhite@redhat.com> - 2.1.1-6
- Rebuilt off of current upstream. Resolves: rhbz#1938880
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

-* Tue Aug 10 2021 Chris White <chwhite@redhat.com> - 2.1.1-5
- Renamed the gating.yml to gating.yaml Related: rhbz#1975886
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.1.1-4
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

-* Fri Aug 6 2021 Chris White <chwhite@redhat.com> - 2.1.1-3
- Rebuilt for c9s and gating test. Related: rhbz#1953419
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.1.1-2
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

 * Sat Feb 20 2021 Christopher Engelhard <ce@lcts.de> - 2.1.1-1
 - Update to 2.1.1