Accepting request 986103 from Base:System
- Update to release 30 OBS-URL: https://build.opensuse.org/request/show/986103 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kmod?expand=0&rev=71
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
408320e822
33
0001-testsuite-repair-read-of-uninitialized-memory.patch
Normal file
33
0001-testsuite-repair-read-of-uninitialized-memory.patch
Normal file
@ -0,0 +1,33 @@
|
||||
From 16c086f48c2270ad6412ad7226df53079f825270 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
Date: Thu, 30 Jun 2022 18:47:25 +0200
|
||||
Subject: [PATCH] testsuite: repair read of uninitialized memory
|
||||
References: https://github.com/kmod-project/kmod/pull/15
|
||||
References: https://github.com/kmod-project/kmod/issues/14
|
||||
|
||||
Function ``test_backoff_time`` does not initialize ``delta``, and
|
||||
``get_backoff_delta_msec`` then performs a read from uninitialized
|
||||
memory with the ``!*delta`` expression.
|
||||
|
||||
Signed-off-by: Jan Engelhardt <jengelh@inai.de>
|
||||
Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
|
||||
---
|
||||
testsuite/test-util.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/testsuite/test-util.c b/testsuite/test-util.c
|
||||
index fb8c9ef..5766584 100644
|
||||
--- a/testsuite/test-util.c
|
||||
+++ b/testsuite/test-util.c
|
||||
@@ -231,7 +231,7 @@ DEFINE_TEST(test_addu64_overflow,
|
||||
|
||||
static int test_backoff_time(const struct test *t)
|
||||
{
|
||||
- unsigned long long delta;
|
||||
+ unsigned long long delta = 0;
|
||||
|
||||
/* Check exponential increments */
|
||||
get_backoff_delta_msec(now_msec(), now_msec() + 10, &delta);
|
||||
--
|
||||
2.36.1
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEE6rM8lpABPHM5FqyDm6KlpjDL6lMFAmCm6vQACgkQm6KlpjDL
|
||||
6lNQNg/+KiyVKaM7w7Kc3aoHxewYxDbqpRUYIhmcmRXWM5UNjLWnPudHJv7i7b8f
|
||||
Ztj5TECYkR5cnw4klKbQERGH9jX/ZlGMp4xGDnmdVZ72T202N3JSAj7Hieew8569
|
||||
b0rfUwXN9dUK6nJTUmi79IXJfV3Tmik4Eqsb9fVUJN0mJmHSZjGPIfTbVOgtq/9F
|
||||
tiGIAQXc/YZuXoV7fcppAXxLbKsftTliYd/B9U3Sz+4ZZ6Lx3Ki77utg9p3KhVux
|
||||
F60Y3JvbhiY72BkVToEAb+TadenJKc+4GquAA4/RivGhTW8aPHCDVqRR6aVGsWZs
|
||||
tE/7jKHXqnwNzu8CodG6aIGia9EvMOegJlypDbaeHYlVCn6aoH8fHi3GcTg2aUdA
|
||||
10LahavjAw6542XdM84SClMTqjHuHjYCOMSu8wjoCSoMQKxkI74LLndcTntXMJ8v
|
||||
EQ6I5NPJqCtZLdTpWppKC3BZAcQFdaksSBmISsoRZq2ruleOdglnujTf6QmpgcE6
|
||||
fZNajslMcMQ1CIMwlvTWBLSlkk7Tr+Msca1fFm3FA3WrYDhcRpkLYnERjW6tkEI/
|
||||
mUhRTIB67haNwn8Y+HNc0Bl7toJr4nmYA85I4Ffqo7/VEPw5WkSa3yNiEgT/cy0b
|
||||
Ubd6epfJqFG2VqGbw+dsiXKhbnxe9wiLibGm1XFIwB3bbRoz0XY=
|
||||
=1dko
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0b80eea7aa184ac6fd20cafa2a1fdf290ffecc70869a797079e2cc5c6225a52a
|
||||
size 560160
|
||||
16
kmod-30.tar.sign
Normal file
16
kmod-30.tar.sign
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEE6rM8lpABPHM5FqyDm6KlpjDL6lMFAmK9v0IACgkQm6KlpjDL
|
||||
6lNxuRAAhPg6EYA3Y+fYefTDN7sEc4LA64Y8uu7GIHqZzTwislxN+15pU5gSUjDF
|
||||
igk84+lYEnmgO5uMVdQrilelxzhq4lhxxjwTjSK/nFUzZoCAQDGirWk34FnMcXCi
|
||||
mHtbqtFy9ZZdZ+ktisI1uGKYkTNIhhQp6iuLdgYugSVgEjXTKIhjZsRu96OzY82a
|
||||
1qh7i4CZNCqaS2qPjs8FukBwvgG1xEp3mlnZMkjA9j28WJVsJ9dxxkdXB03wfnvf
|
||||
E1lFX4HDqwLH//vXQvDo4nD6JhXNGn7bSCKWb88doW6KkMCBhPVKql/lo2It2+sj
|
||||
VbmzCrtn8GR42FmVhJZKMPMLxYsUgRVn08W2y6ThZOBWtK5tFCOHHHhGjh3D16WI
|
||||
9jVmmvmn9bNNNhrJJncRWUfmYlf4v9CX8yBfzq5a4z7XYloo/XR77WDuB+G0o4jN
|
||||
vukauZhsVg8LxPIv+q6xfE0WRzOqAjl2qQRdewYJJBDXLFTa8/9QlYy/LMEPZ6u9
|
||||
hMnrUNHjUQBVojKLxHlArjZXflSp5DY46+IyhRrFWnPd1wArTvF0IStJn2rm2UuO
|
||||
F0MfRXwMJwqll7TR9lai+X+7deh+F9YY5XyhXKXTseJYnaO28rzVMk+tBHmZFm5l
|
||||
1R9gq+TsJZBVLKeb/QpeCdfdkoyDAmnd0PB8aA6IHdwzgx9nBB0=
|
||||
=SXtI
|
||||
-----END PGP SIGNATURE-----
|
||||
BIN
kmod-30.tar.xz
(Stored with Git LFS)
Normal file
BIN
kmod-30.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -22,7 +22,7 @@
|
||||
|
||||
Name: kmod-testsuite
|
||||
%define lname libkmod2
|
||||
Version: 29
|
||||
Version: 30
|
||||
Release: 0
|
||||
Summary: Testsuite of the kmod package
|
||||
License: GPL-2.0-or-later AND LGPL-2.1-or-later
|
||||
@ -42,7 +42,7 @@ Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch
|
||||
Patch6: 0012-modprobe-print-unsupported-status.patch
|
||||
Patch7: usr-lib-modprobe.patch
|
||||
Patch8: no-stylesheet-download.patch
|
||||
Patch9: libkmod-Provide-info-even-for-modules-built-into-the.patch
|
||||
Patch9: 0001-testsuite-repair-read-of-uninitialized-memory.patch
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: docbook-xsl-stylesheets
|
||||
@ -74,7 +74,7 @@ buildloop with the kernel.
|
||||
%autopatch -p1
|
||||
|
||||
%build
|
||||
autoreconf -fi
|
||||
GTKDOCIZE=/bin/true autoreconf -fi
|
||||
export LDFLAGS="-Wl,-z,relro,-z,now"
|
||||
# The extra --includedir gives us the possibility to detect dependent
|
||||
# packages which fail to properly use pkgconfig.
|
||||
|
||||
10
kmod.changes
10
kmod.changes
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 30 16:15:35 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Update to release 30
|
||||
* libkmod: support for the SM3 hash algorithm
|
||||
* modprobe: added the --wait option
|
||||
- Drop libkmod-Provide-info-even-for-modules-built-into-the.patch
|
||||
(merged)
|
||||
- Add 0001-testsuite-repair-read-of-uninitialized-memory.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 28 15:01:46 UTC 2022 - Dirk Müller <dmueller@suse.com>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
|
||||
Name: kmod
|
||||
%define lname libkmod2
|
||||
Version: 29
|
||||
Version: 30
|
||||
Release: 0
|
||||
Summary: Utilities to load modules into the kernel
|
||||
License: GPL-2.0-or-later AND LGPL-2.1-or-later
|
||||
@ -42,7 +42,7 @@ Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch
|
||||
Patch6: 0012-modprobe-print-unsupported-status.patch
|
||||
Patch7: usr-lib-modprobe.patch
|
||||
Patch8: no-stylesheet-download.patch
|
||||
Patch9: libkmod-Provide-info-even-for-modules-built-into-the.patch
|
||||
Patch9: 0001-testsuite-repair-read-of-uninitialized-memory.patch
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: docbook-xsl-stylesheets
|
||||
@ -116,7 +116,7 @@ in %lname.
|
||||
%autosetup -p1
|
||||
|
||||
%build
|
||||
autoreconf -fi
|
||||
GTKDOCIZE=/bin/true autoreconf -fi
|
||||
export LDFLAGS="-Wl,-z,relro,-z,now"
|
||||
# The extra --includedir gives us the possibility to detect dependent
|
||||
# packages which fail to properly use pkgconfig, cf. bugzilla.opensuse.org/795968
|
||||
|
||||
@ -1,60 +0,0 @@
|
||||
From lucas.demarchi@intel.com Wed Aug 18 23:25:03 2021
|
||||
To: linux-modules <linux-modules@vger.kernel.org>
|
||||
Subject: [PATCH v2] libkmod: Set builtin to no when module is created from path.
|
||||
Date: Wed, 18 Aug 2021 14:24:39 -0700
|
||||
Message-Id: <20210818212440.2224127-1-lucas.demarchi@intel.com>
|
||||
From: Michal Suchanek <msuchanek@suse.de>
|
||||
|
||||
A recent bug report showed that modinfo doesn't give the signature
|
||||
information for certain modules, and it turned out to happen only on
|
||||
the modules that are built-in on the running kernel; then modinfo
|
||||
skips the signature check, as if the target module file never exists.
|
||||
The behavior is, however, inconsistent when modinfo is performed for
|
||||
external modules (no matter which kernel version is) and the module
|
||||
file path is explicitly given by a command-line argument, which
|
||||
guarantees the presence of the module file itself.
|
||||
|
||||
Fixes: e7e2cb61fa9f ("modinfo: Show information about built-in modules")
|
||||
Link: https://lore.kernel.org/linux-modules/CAKi4VAJVvY3=JdSZm-GD1hJqyCPYaYz-jBJ_REeY5BakVb6_ww@mail.gmail.com/
|
||||
BugLink: https://bugzilla.opensuse.org/show_bug.cgi?id=1189537
|
||||
Suggested-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
|
||||
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
|
||||
---
|
||||
libkmod/libkmod-module.c | 17 +++++++++--------
|
||||
1 file changed, 9 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
|
||||
index 6e0ff1a..6f7747c 100644
|
||||
--- a/libkmod/libkmod-module.c
|
||||
+++ b/libkmod/libkmod-module.c
|
||||
@@ -431,17 +431,18 @@ KMOD_EXPORT int kmod_module_new_from_path(struct kmod_ctx *ctx,
|
||||
return -EEXIST;
|
||||
}
|
||||
|
||||
- *mod = kmod_module_ref(m);
|
||||
- return 0;
|
||||
- }
|
||||
+ kmod_module_ref(m);
|
||||
+ } else {
|
||||
+ err = kmod_module_new(ctx, name, name, namelen, NULL, 0, &m);
|
||||
+ if (err < 0) {
|
||||
+ free(abspath);
|
||||
+ return err;
|
||||
+ }
|
||||
|
||||
- err = kmod_module_new(ctx, name, name, namelen, NULL, 0, &m);
|
||||
- if (err < 0) {
|
||||
- free(abspath);
|
||||
- return err;
|
||||
+ m->path = abspath;
|
||||
}
|
||||
|
||||
- m->path = abspath;
|
||||
+ m->builtin = KMOD_MODULE_BUILTIN_NO;
|
||||
*mod = m;
|
||||
|
||||
return 0;
|
||||
--
|
||||
2.31.1
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user