rpms/sysfsutils
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Merged update from upstream sources

Browse Source 
This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/sysfsutils.git#e451bcab220a89b6dda732a4d633e85092bde401
This commit is contained in:
DistroBaker 2021-02-20 16:15:20 +00:00
parent afe18d3d35
commit de4c00bfc1
12 changed files with 21 additions and 18318 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -1 +1,2 @@
sysfsutils-2_1_0.tar.gz
*.tar.gz
sysfsutils-*/

40
0001-update-README.patch
View File

@ -1,40 +0,0 @@
From a9957ec35dfd2368c25d02b27859066299cf849c Mon Sep 17 00:00:00 2001
From: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Date: Wed, 26 Feb 2020 19:22:54 +0530
Subject: [PATCH 1/8] README: Update reporting bugs/contributions section
We have moved to a new home at GitHub. Update the reporting
bugs/contributions sections to reflect GitHub's work flow.
Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
---
README | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/README b/README
index 6deefcf..bd1f832 100644
--- a/README
+++ b/README
@@ -62,9 +62,14 @@ sysfsutils/lib/LGPL
4. Reporting Bugs
-----------------
-Please direct all bugs to either the linux-diag mailing list -
-linux-diag-devel@lists.sourceforge.net - or to the authors:
+Feel free to report bugs by opening an issue in the GitHub Issue Tracker.
-Ananth Mavinakayanahalli <ananth@in.ibm.com>
-Daniel Stekloff <dsteklof@us.ibm.com>
-Mohan Kumar <mohan@in.ibm.com>
+5. Contributions
+----------------
+
+For submitting patches, open a GitHub pull request. Please make sure that they
+are rebased on top of the current master. Code submission guidelines are the
+same as the Linux Kernel contribution guidelines.
+
+You probably want to read the through Linux kernel Documentation/SubmittingPatches
+for guidance.
--
2.28.0

16225
0002-fix-compiler-complaints.patch
View File

File diff suppressed because it is too large Load Diff

43
0003-use-stat-not-lstat.patch
View File

@ -1,43 +0,0 @@
From 88b1ba388e6908e1bca3ef1779325e5b9a688f9c Mon Sep 17 00:00:00 2001
From: Lee Duncan <lduncan@suse.com>
Date: Thu, 25 Jun 2020 10:04:40 -0700
Subject: [PATCH 3/8] Use stat() not lstat() to find link target.
The test was backwards? We are trying to find what the
link points at, not info about the link.
path_is_file() should call stat(), not lstat()
---
lib/sysfs_utils.c | 2 +-
test/test.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/sysfs_utils.c b/lib/sysfs_utils.c
index bd6f9c1..bddf722 100644
--- a/lib/sysfs_utils.c
+++ b/lib/sysfs_utils.c
@@ -292,7 +292,7 @@ int sysfs_path_is_file(const char *path)
errno = EINVAL;
return 1;
}
- if ((lstat(path, &astats)) != 0) {
+ if ((stat(path, &astats)) != 0) {
dprintf("stat() failed\n");
return 1;
}
diff --git a/test/test.c b/test/test.c
index ab2397d..41a470c 100644
--- a/test/test.c
+++ b/test/test.c
@@ -165,7 +165,7 @@ static int path_is_dir(const char *path)
{
struct stat astats;
- if ((lstat(path, &astats)) != 0)
+ if ((stat(path, &astats)) != 0)
goto direrr;
if (S_ISDIR(astats.st_mode))
--
2.28.0

31
0004-support-ppc64le.patch
View File

@ -1,31 +0,0 @@
From d4a7c673f65ac4ed257be7d3c380108a88f5c510 Mon Sep 17 00:00:00 2001
From: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Date: Mon, 29 Jun 2020 14:26:30 +0530
Subject: [PATCH 4/8] config.guess: linux - Add support for ppc64le machine
Configure fails to guess ppc64le machine type under the Linux system.
This patch adds support to recognize ppc64le by adding it to the list
of valid Linux systems.
Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
---
config.guess | 3 +++
1 file changed, 3 insertions(+)
diff --git a/config.guess b/config.guess
index 2fc3acc..9b3e674 100644
--- a/config.guess
+++ b/config.guess
@@ -864,6 +864,9 @@ EOF
ppc64:Linux:*:*)
echo powerpc64-${VENDOR:-unknown}-linux-gnu
exit 0 ;;
+ ppc64le:Linux:*:*)
+ echo powerpc64le-${VENDOR:-unknown}-linux-gnu
+ exit 0 ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
EV5) UNAME_MACHINE=alphaev5 ;;
--
2.28.0

58
0005-fix-sysfs-name-comparisons.patch
View File

@ -1,58 +0,0 @@
From 0277758bed2870a6feb3757ffd88930b7128f31a Mon Sep 17 00:00:00 2001
From: Lee Duncan <lduncan@suse.com>
Date: Fri, 3 Jul 2020 11:14:20 -0700
Subject: [PATCH 5/8] Fix issue with sysfs name comparisons.
It turns out that cdev_name_equal() is used
by dlist_find_custom() to compare sysfs
entry names to ones already seen. But it was
comparing using the length of the shortest string
as a maximum, so when it compared, for example,
"eth1" and "eth10", it thought they were the same.
So now just return failure if the strings
aren't the same length, else go ahead and
compare them.
---
lib/sysfs_class.c | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/lib/sysfs_class.c b/lib/sysfs_class.c
index 4fe0b82..c696ff0 100644
--- a/lib/sysfs_class.c
+++ b/lib/sysfs_class.c
@@ -60,13 +60,30 @@ void sysfs_close_class(struct sysfs_class *cls)
}
}
+/*
+ * pass this function to dlist_find_custom()
+ * so it can compare device names
+ *
+ * return 1 if pathnames are equal, else 0
+ */
static int cdev_name_equal(void *a, void *b)
{
+ size_t length_a, length_b;
+ char *str_a, *str_b;
+
if (!a || !b)
return 0;
- if (strncmp((char *)a, ((struct sysfs_class_device *)b)->name,
- strlen((char *)a)) == 0)
+ str_a = (char *)a;
+ str_b = ((struct sysfs_class_device *)b)->name;
+
+ length_a = strnlen(str_a, SYSFS_NAME_LEN+1);
+ length_b = strnlen(str_b, SYSFS_NAME_LEN+1);
+
+ if (length_a != length_b)
+ return 0;
+
+ if (strncmp(str_a, str_b, SYSFS_NAME_LEN+1) == 0)
return 1;
return 0;
--
2.28.0

30
0006-limit-cdev-name-length-comparsion.patch
View File

@ -1,30 +0,0 @@
From 34df9af8e15e331f45c3a453852d5a24486744ed Mon Sep 17 00:00:00 2001
From: Lee Duncan <lduncan@suse.com>
Date: Wed, 8 Jul 2020 11:17:18 -0700
Subject: [PATCH 6/8] Limit cdev name length comparsion to strlen()+1
In commit 270af678d4241306 cdev_name_equal() was updated
so that "eth1" and "eth10" did not match, but the limit
on the length of the compare was too large, as we know
the length of both strings. This is just a cleanup, and
should cause no functional change.
---
lib/sysfs_class.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/sysfs_class.c b/lib/sysfs_class.c
index c696ff0..fcaa488 100644
--- a/lib/sysfs_class.c
+++ b/lib/sysfs_class.c
@@ -83,7 +83,7 @@ static int cdev_name_equal(void *a, void *b)
if (length_a != length_b)
return 0;
- if (strncmp(str_a, str_b, SYSFS_NAME_LEN+1) == 0)
+ if (strncmp(str_a, str_b, length_a+1) == 0)
return 1;
return 0;
--
2.28.0

175
0007-fix-sysfs_get_link.patch
View File

@ -1,175 +0,0 @@
From b93c115b71c08a2f19262e6adccfdb5a5e5b2a78 Mon Sep 17 00:00:00 2001
From: Christopher Engelhard <ce@lcts.de>
Date: Tue, 28 Jul 2020 17:35:05 +0200
Subject: [PATCH 7/8] Fix bug in sysfs_get_link
This fixes RHBZ #447220/Debian Bug #481015 by applying the patch
provided in those bugs.
---
lib/sysfs_utils.c | 128 +++++++++++++++++++++++++++-------------------
1 file changed, 76 insertions(+), 52 deletions(-)
diff --git a/lib/sysfs_utils.c b/lib/sysfs_utils.c
index bddf722..e9bc555 100644
--- a/lib/sysfs_utils.c
+++ b/lib/sysfs_utils.c
@@ -117,80 +117,104 @@ int sysfs_get_link(const char *path, char *target, size_t len)
{
char devdir[SYSFS_PATH_MAX];
char linkpath[SYSFS_PATH_MAX];
- char temp_path[SYSFS_PATH_MAX];
- char *d = NULL, *s = NULL;
- int slashes = 0, count = 0;
+ char *d, *s;
+ int count;
if (!path || !target || len == 0) {
errno = EINVAL;
return -1;
}
- memset(devdir, 0, SYSFS_PATH_MAX);
- memset(linkpath, 0, SYSFS_PATH_MAX);
- memset(temp_path, 0, SYSFS_PATH_MAX);
- safestrcpy(devdir, path);
-
- if ((readlink(path, linkpath, SYSFS_PATH_MAX)) < 0) {
+ count = readlink(path, linkpath, SYSFS_PATH_MAX);
+ if (count < 0)
return -1;
- }
- d = linkpath;
+ else
+ linkpath[count] = '\0';
/*
* Three cases here:
* 1. relative path => format ../..
* 2. absolute path => format /abcd/efgh
* 3. relative path _from_ this dir => format abcd/efgh
*/
- switch (*d) {
- case '.':
+ if (*linkpath == '/') {
+ /* absolute path - copy as is */
+ safestrcpymax(target, linkpath, len);
+ return 0;
+ }
+
+ safestrcpy(devdir, path);
+ s = strrchr(devdir, '/');
+ if (s == NULL)
+ s = devdir - 1;
+ d = linkpath;
+ while (*d == '.') {
+ if (*(d+1) == '/') {
/*
* handle the case where link is of type ./abcd/xxx
*/
- safestrcpy(temp_path, devdir);
- if (*(d+1) == '/')
- d += 2;
- else if (*(d+1) == '.')
- goto parse_path;
- s = strrchr(temp_path, '/');
- if (s != NULL)
- safestrcpy(s+1, d);
- else
- safestrcpy(temp_path, d);
- safestrcpymax(target, temp_path, len);
- break;
+ d += 2;
+ while (*d == '/')
+ d++;
+ continue;
+ } else if (*(d+1) != '.' || *(d+2) != '/')
/*
- * relative path, getting rid of leading "../.."
+ * relative path from this directory, starting
+ * with a hidden directory
*/
-parse_path:
- while (*d == '/' || *d == '.') {
- if (*d == '/')
- slashes++;
- d++;
- }
- d--;
- s = &devdir[strlen(devdir)-1];
- while (s != NULL && count != (slashes+1)) {
+ break;
+
+ /*
+ * relative path, getting rid of leading "../.."; must
+ * be careful here since any path component of devdir
+ * could be a symlink again
+ */
+ for (;;) {
+ while (s > devdir && *s == '/') {
s--;
- if (*s == '/')
- count++;
+ if (*s == '.'
+ && (s == devdir || *(s-1) == '/'))
+ s--;
}
- safestrcpymax(s, d, (SYSFS_PATH_MAX-strlen(devdir)));
- safestrcpymax(target, devdir, len);
- break;
- case '/':
- /* absolute path - copy as is */
- safestrcpymax(target, linkpath, len);
+ *(s+1) = '\0';
+ if (*devdir == '\0' || sysfs_path_is_link(devdir))
+ /*
+ * condition will be true eventually
+ * because we already know that all
+ * but the last component of path
+ * resolve to a directory
+ */
+ break;
+ if (sysfs_get_link(devdir, devdir, SYSFS_PATH_MAX))
+ return -1;
+ s = devdir + strlen(devdir) - 1;
+ }
+ while (s >= devdir) {
+ if (*s == '/') {
+ if (*(s+1) != '.' || *(s+2) != '.'
+ || *(s+3) != '\0') {
+ d += 3;
+ while (*d == '/')
+ d++;
+ } else
+ s += 2;
+ break;
+ }
+ s--;
+ }
+ if (s < devdir || *(s+1) == '\0')
break;
- default:
- /* relative path from this directory */
- safestrcpy(temp_path, devdir);
- s = strrchr(temp_path, '/');
- if (s != NULL)
- safestrcpy(s+1, linkpath);
- else
- safestrcpy(temp_path, linkpath);
- safestrcpymax(target, temp_path, len);
}
+
+ /*
+ * appending to devdir a slash and the (possibly shortened)
+ * relative path to the link source
+ */
+ s++;
+ if (s > devdir && *s == '\0')
+ *s++ = '/';
+ *s = '\0';
+ safestrcpymax(s, d, SYSFS_PATH_MAX-(s-devdir));
+ safestrcpymax(target, devdir, len);
return 0;
}
--
2.28.0

1633
0008-clarify-license-fix-typos.patch
View File

File diff suppressed because it is too large Load Diff

52
0009-fix-GCC-11-build-failure.patch
View File

@ -1,52 +0,0 @@
From 840b639f9e807e1dab4e14817fe72657b9252e53 Mon Sep 17 00:00:00 2001
From: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Date: Thu, 17 Sep 2020 20:31:25 +0530
Subject: lib/sysfs_class: fix build failure reported on GCC-11
Christopher reported that, the build fails with GCC-11. It introduces a
-Wstringop-overread, that warns about reading past the end in string
functions. cdev_name_equal() does a comparison, which compares strings
past SYSFS_NAME_LEN. It currently calculates the string lengths of both
string and does a comparison on strings of equal length.
This patch refactors the function to compare, the strings until
SYSFS_NAME_LEN, removing the string length comparison logic.
Fixes #12 ("Build failure with GCC-11 due to stringop-overread")
Reported-by: Christopher Engelhard <ce@lcts.de>
Tested-by: Christopher Engelhard <ce@lcts.de>
Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
---
lib/sysfs_class.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/lib/sysfs_class.c b/lib/sysfs_class.c
index fcaa488..6389892 100644
--- a/lib/sysfs_class.c
+++ b/lib/sysfs_class.c
@@ -68,7 +68,6 @@ void sysfs_close_class(struct sysfs_class *cls)
*/
static int cdev_name_equal(void *a, void *b)
{
- size_t length_a, length_b;
char *str_a, *str_b;
if (!a || !b)
@@ -77,13 +76,7 @@ static int cdev_name_equal(void *a, void *b)
str_a = (char *)a;
str_b = ((struct sysfs_class_device *)b)->name;
- length_a = strnlen(str_a, SYSFS_NAME_LEN+1);
- length_b = strnlen(str_b, SYSFS_NAME_LEN+1);
-
- if (length_a != length_b)
- return 0;
-
- if (strncmp(str_a, str_b, length_a+1) == 0)
+ if (strncmp(str_a, str_b, SYSFS_NAME_LEN) == 0)
return 1;
return 0;
--
2.26.2

1
sources
View File

@ -1 +1,2 @@
SHA512 (sysfsutils-2_1_0.tar.gz) = f9e2dd77df5de7323c41940781eb161aaad092045379df13abc248c0dd8455ba9a793e2ee9f2b6d3effe87e07ea3e8cdc012bab926a49ba7f4fd48f22b3138f0
SHA512 (v2.1.1.tar.gz) = 7e1c8535be3c29dec8e23e8b6e8d3ec794bbdc696f161fa38731844c82cc1d37ff04f94c8b0ec0cf8da7147fc696dad0086262641984fa67378ffd2f162dc358

48
sysfsutils.spec
View File

@ -3,29 +3,18 @@
%global so_patch_version 1
Name: sysfsutils
Version: 2.1.0
Release: 33%{?dist}
Version: 2.1.1
Release: 1%{?dist}
Summary: Utilities for interfacing with sysfs
URL: https://github.com/linux-ras/sysfsutils
License: GPLv2
Source0: https://github.com/linux-ras/sysfsutils/archive/sysfsutils-%(echo %{version} | tr '.' '_').tar.gz
# backport upstream fixes up to commit b688c65
# these also obsolete sysfsutils-2.0.0-class-dup.patch & sysfsutils-aarch64.patch
Patch1: 0001-update-README.patch
Patch2: 0002-fix-compiler-complaints.patch
Patch3: 0003-use-stat-not-lstat.patch
Patch4: 0004-support-ppc64le.patch
Patch5: 0005-fix-sysfs-name-comparisons.patch
Patch6: 0006-limit-cdev-name-length-comparsion.patch
# upstreamed version of sysfsutils-2.1.0-get_link.patch, PR#10
Patch7: 0007-fix-sysfs_get_link.patch
# upstreamed version of formatting/typo/license-related fedora patches, PR#9
Patch8: 0008-clarify-license-fix-typos.patch
# upstream issue #12 / PR#13
Patch9: 0009-fix-GCC-11-build-failure.patch
Source0: https://github.com/linux-ras/sysfsutils/archive/v%{version}.tar.gz
BuildRequires: make
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: make
BuildRequires: gcc
%description
@ -49,32 +38,23 @@ libsysfs-devel provides the header files and static libraries required
to build programs using the libsysfs API.
%prep
%autosetup -p1 -n %{name}-%{name}-%(echo %{version} | tr '.' '_')
%autosetup -p1
%build
./autogen
%configure --disable-static
%{make_build}
%install
%{make_install}
rm -f %{buildroot}%{_bindir}/dlist_test \
%{buildroot}%{_bindir}/get_bus_devices_list \
%{buildroot}%{_bindir}/get_class_dev \
%{buildroot}%{_bindir}/get_classdev_parent \
%{buildroot}%{_bindir}/get_device \
%{buildroot}%{_bindir}/get_driver \
%{buildroot}%{_bindir}/testlibsysfs \
%{buildroot}%{_bindir}/write_attr
find %{buildroot} -type f -name "*.la" -delete
%ldconfig_scriptlets -n libsysfs
%files
%license COPYING cmd/GPL
%doc AUTHORS README NEWS CREDITS ChangeLog docs/libsysfs.txt
%doc AUTHORS README CREDITS docs/libsysfs.txt
%{_bindir}/systool
%{_bindir}/get_module
%{_mandir}/man1/systool.1.gz
%files -n libsysfs
@ -87,9 +67,17 @@ find %{buildroot} -type f -name "*.la" -delete
%{_includedir}/sysfs/libsysfs.h
%{_includedir}/sysfs/dlist.h
/%{_libdir}/libsysfs.so
/%{_libdir}/pkgconfig/libsysfs.pc
%changelog
* Sat Feb 20 2021 Christopher Engelhard <ce@lcts.de> - 2.1.1-1
- Update to 2.1.1
- Remove all patches merged upstream
- Switched build to autotools
- Include upstream pkgconfig module
- Sysfsutils no longer includes /usr/bin/get_module
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-33
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild