Yauheni Kaliuta [Fri, 16 Nov 2018 08:56:34 +0000 (10:56 +0200)]
signature: do not report wrong data for pkc#7 signature
when PKC#7 signing method is used the old structure doesn't contain
any useful data, but the data are encoded in the certificate.
The info getting/showing code is not aware of that at the moment and
since 0 is a valid constant, shows, for example, wrong "md4" for the
hash algo.
The patch splits the 2 mothods of gethering the info and reports
"unknown" for the algo.
Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
Lucas De Marchi [Tue, 13 Nov 2018 18:45:00 +0000 (10:45 -0800)]
testsuite: add simple test for --show-exports
Yauheni Kaliuta [Tue, 13 Nov 2018 09:00:29 +0000 (11:00 +0200)]
modprobe: add --show-exports
modprobe has --show-modversions switch, which dumps symbols with
their modversion crcs from the __versions sections.
At the moment the section contains information for the dependency
symbols only, while exported symbols add to symtab entries with
__crc_ prefix (the format may differ, see
1e48901166ef libkmod-elf:
resolve CRC if module is built with MODULE_REL_CRCS).
The patch makes it to show exported symbols as well.
The function is basically cut'n'paste of show_modversions(),
but 'version' family replaced with 'symbol' one.
Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
Lucas De Marchi [Wed, 10 Oct 2018 20:47:50 +0000 (13:47 -0700)]
mkosi: allow Clear to use test modules
Now Clear has a bundle for the kernel headers, let's use it.
Lucas De Marchi [Fri, 20 Jul 2018 20:23:57 +0000 (13:23 -0700)]
man: depmod: remove deprecated -m option
Thanks to Howard Johnson <hwj@bridgeportcontractor.com> for noticing.
Jan Engelhardt [Sat, 16 Jun 2018 06:45:20 +0000 (08:45 +0200)]
kmod: build: cure compiler warnings showing up externally
When building a C source file with gcc-7 -Wshift-overflow=2, this warning
springs up:
libkmod.h: warning: result of "1 << 31" requires 33 bits to
represent, but "int" only has 32 bits [-Wshift-overflow=]
Change the two _KMOD_* identifiers to fit into 32 bits.
Jakov Simunic [Wed, 16 May 2018 17:24:37 +0000 (10:24 -0700)]
build: fix wrong quotes on bootstrap
Chris Stackpole [Fri, 20 Apr 2018 19:46:58 +0000 (14:46 -0500)]
Phrasing correction in modprobe man page
Luca Bruno [Wed, 7 Mar 2018 10:51:21 +0000 (10:51 +0000)]
libkmod-module: check for NULL before accessing pointers
This introduces a few missing NULL-checks in public functions, and
align their docstrings with real behavior by getting rid of copy-paste
mistakes.
Signed-off-by: Luca Bruno <luca.bruno@coreos.com>
Lucas De Marchi [Fri, 9 Feb 2018 17:19:53 +0000 (09:19 -0800)]
testsuite: raise arch image to 3GB
Caio Marcelo de Oliveira Filho [Thu, 8 Feb 2018 23:08:22 +0000 (15:08 -0800)]
testsuite: add Clear's mkosi configuration
Adapted the mkosi.build script to account for not building
test-modules in Clear. It doesn't have the headers available yet.
Lucas De Marchi [Tue, 9 Jan 2018 01:30:39 +0000 (17:30 -0800)]
kmod 25
Lucas De Marchi [Mon, 8 Jan 2018 16:22:29 +0000 (08:22 -0800)]
testsuite: also wrap gettid in syscall()
Not a perfect solution for overriding syscall(), but at least
it makes the testsuite to pass in a modified nsswitch.conf (one that has
a module which calls syscall() to get the thread id).
Lucas De Marchi [Wed, 3 Jan 2018 22:14:06 +0000 (14:14 -0800)]
testsuite: explain why overriding function may fail
On my computer `testsuite/test-modprobe modprobe_install_cmd_loop` was
failing because when it forks off the shell the child process ends up
calling syscall() which are are supposed to wrap. Here's the backtrace:
#0 0x00007ffff6fdb66b in raise () from /lib64/libc.so.6
#1 0x00007ffff6fdd381 in abort () from /lib64/libc.so.6
#2 0x00007ffff77bac97 in syscall (__sysno=<optimized out>)
at testsuite/init_module.c:362
#3 0x00007fffef92d4e7 in hashmap_base_new.lto_priv () from /lib64/libnss_systemd.so.2
#4 0x00007fffef953f50 in sd_bus_open_system () from /lib64/libnss_systemd.so.2
#5 0x00007fffef943123 in _nss_systemd_getpwuid_r () from /lib64/libnss_systemd.so.2
#6 0x00007ffff707eea5 in getpwuid_r@@GLIBC_2.2.5 () from /lib64/libc.so.6
#7 0x00007ffff707e608 in getpwuid () from /lib64/libc.so.6
#8 0x00005555555859e1 in get_current_user_info.part ()
#9 0x00005555555a375a in initialize_shell_variables ()
#10 0x0000555555580fde in shell_initialize ()
#11 0x00005555555846ff in main ()<Paste>
The reason it fails on my system and not on, for e.g., a new one set up with
mkosi is that the call to getpwuid() depends on the contents
/etc/nsswitch.conf. The systemd module calls syscall() to implement gettid()
which we can't forward due to being a variadic function.
No fix is provided here, but at least it's explained why this happens.
Lucas De Marchi [Wed, 3 Jan 2018 21:37:59 +0000 (13:37 -0800)]
testsuite: add missing error handling
If we passed an invalid argument to a test it would segfault rather than
returning an error code.
Lucas De Marchi [Wed, 3 Jan 2018 19:23:51 +0000 (11:23 -0800)]
testsuite: add Fedora's mkosi configuration
To use the Fedora configuration rather than the default, one should
use:
# make DISTRO=fedora mkosi
While at it also reduce the root partition size for Arch, since it
doesn't need that much.
Lucas De Marchi [Wed, 3 Jan 2018 19:19:02 +0000 (11:19 -0800)]
testsuite: generalize mkosi support for other distros
Instead of using the mkosi.default symlink, use an env var passed from
the build system. We would need to pass the --default switch nonetheless
or change the symlink, making the git tree dirty.
Also, search for installed kernel headers in a way that's compatible
with more distros. On Fedora, for example, the
/usr/lib/modules/<kver>/build symlink is only available if there's a
kernel installed. We don't care about a kernel installed since we don't
need to boot it on a real machine: the only thing we need is the
kernel-devel package.
Lucas De Marchi [Wed, 3 Jan 2018 02:17:51 +0000 (18:17 -0800)]
build: use tool from configure
This way we make sure the tool will be the one we actually configured
before going through sudo.
Lucas De Marchi [Tue, 2 Jan 2018 22:08:03 +0000 (14:08 -0800)]
build: add mkosi hooks
Right now there's support for building on Archlinux only.
Yauheni Kaliuta [Thu, 7 Dec 2017 19:16:08 +0000 (21:16 +0200)]
depmod: module_is_higher_priority: fix modname length calculation
depmod_module_is_higher_priority checks module's path if it is under
module root directory and if so uses relative to the root path to
lookup the module in override and search lists.
Originally only relative path was used in the function, so the
variables with full path and and path length were changed:
newpath += cfg->dirnamelen + 1;
newlen -= cfg->dirnamelen + 1;
oldpath += cfg->dirnamelen + 1;
oldlen -= cfg->dirnamelen + 1;
Commit
7da6884e7357ac05772e90f6d7e63b1948103fc4 (depmod: implement
external directories support) changed the logic since it need the
full path to the module for comparations as well.
Unfortunately, it introduce a mistake in calculation of the relative
paths replacing '-=' with assignment to a new variable -- the
'cfg->dirnamelen + 1' value must be substracted all together. It
breaks, for example, overrides lookup.
Fix the calculation by putting braces around the value in the
subsctuction expression.
Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
Yauheni Kaliuta [Thu, 7 Dec 2017 19:16:07 +0000 (21:16 +0200)]
testsuite: depmod: add override test
Simple test to check if depmod honors override keyword. Uses
mod-simple.ko for foo/ and override/ directories, search.conf to
search in foo and built-in and simple override configuration:
override mod-simple 4.4.4 override
The resulting modules.dep should point to the override directory.
Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
Michal Suchanek [Thu, 7 Dec 2017 14:31:19 +0000 (15:31 +0100)]
depmod: Don't add .TOC. when it's in the kernel.
d46136bb59c4 ("depmod: Ignore PowerPC64 ABIv2 .TOC. symbol") adds fake
.TOC. unconditionally but when there is .TOC. in the kernel adding the
fake one breaks resolving .TOC.
Fixes:
d46136bb59c4 ("depmod: Ignore PowerPC64 ABIv2 .TOC. symbol")
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
Christopher Díaz Riveros [Mon, 16 Oct 2017 15:48:42 +0000 (10:48 -0500)]
man/depmod: Add references in other man pages
Depmod man page is not referenced in some man pages. This makes it
harder to find through reading documentation.
References added to:
-man/insmod.xml
-man/lsmod.xml
-man/modprobe.xml
-man/rmmod.xml
Signed-off-by: Christopher Díaz Riveros <chrisadr@gentoo.org>
Yauheni Kaliuta [Wed, 19 Jul 2017 14:56:49 +0000 (17:56 +0300)]
libkmod-elf: resolve CRC if module is built with MODULE_REL_CRCS
Normally exported symbol's crc is stored as absolute (SHN_ABS)
value of special named symbol __crc_<symbol name>.
When the kernel and modules are built with the config option
CONFIG_MODULE_REL_CRCS, all the CRCs are put in a special section
and the __crc_<symbol name> symbols values are offsets in the
section. See patch description of the commit:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=
56067812d5b0e737ac2063e94a50f76b810d6ca3
Add kmod support of this configuration.
Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
Yauheni Kaliuta [Thu, 20 Jul 2017 14:09:52 +0000 (17:09 +0300)]
man/depmod.d: add external keyword description
The commit 'depmod: implement external directories support' added
external directories support (see
7da6884e7357ac05772e90f6d7e63b1948103fc4).
This patch documents the extention in the manpage.
Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
Thomas Petazzoni [Sat, 3 Jun 2017 15:03:22 +0000 (17:03 +0200)]
shared/util.c: assert_cc() can only be used inside functions
shared/macro.h has two versions of assert_cc, one that uses gcc
_Static_assert(), which requires recent enough gcc versions, and one
that uses a fake array to trigger a build error. The latter can only
work inside functions, so assert_cc() should only be used inside
functions.
Fixes the following build failure when building kmod with old gcc
versions such as gcc 4.3.x:
shared/util.c:52: error: expected identifier or '(' before 'do'
shared/util.c:52: error: expected identifier or '(' before 'while'
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Yauheni Kaliuta [Tue, 9 May 2017 19:09:24 +0000 (22:09 +0300)]
testsuite: add tests for external directory support
The following tests added:
- depmod_search_order_external_first -- checks if external module
is taken in use when it has higher priority;
- depmod_search_order_external_last -- checks if external module
is skipped when it has lower priority;
- test_modinfo_external -- checks if modinfo is able to look up
correct external module;
- modprobe_external -- checks if modprobe is able to look up
correct external module and loads it.
Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
Yauheni Kaliuta [Tue, 9 May 2017 19:09:23 +0000 (22:09 +0300)]
depmod: implement external directories support
The idea is to add a configuration keyword, external, which
will list directories for scanning for particular kernel version
mask:
external 4.10 /the/modules/dir /second/modules/dir
And extend "search" keyword to set it's priority with pseudo dir
"external" (as it's done for built-in):
search subdir external subdir2 built-in subdir3
(actually, the version is the same as for override keyword: * or
posix regexp, so example above is a bit incorrect).
All other logic left the same: if there are duplicates, only one
is under consideration and it is unloadable if it is bad.
The resulting modules.dep will contain entries a-la:
/the/modules/dir/module1.ko:
kernel/module2.ko: /the/modules/dir/module1.ko
(here /lib/modules/$(uname -r)/kernel/module2.ko depends of
symbols, provided by /the/modules/dir/module1.ko and external has
higher priority).
modprobe and modinfo understand it out of box.
This is a pretty simple extention of existing logic, since now
depmod already is able to:
a) scan modules with full path from command line without -a
switch;
b) detects broken symbol dependencies and broken modversions,
what assumes, that modules are already are not built for the
existing kernel.
Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
Lucas De Marchi [Fri, 2 Jun 2017 03:25:57 +0000 (20:25 -0700)]
test-depmod: avoid warning when we don't have zlib
testsuite/test-depmod.c:31:21: warning: ‘depmod_modules_order_for_compressed’ defined but not used [-Wunused-function]
static noreturn int depmod_modules_order_for_compressed(const struct test *t)
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Yauheni Kaliuta [Tue, 9 May 2017 19:09:22 +0000 (22:09 +0300)]
depmod: rewrite depmod modules search with scratchbuf
The recursive search code used used pretty big, PATH_MAX,
automatic storage buffer for the module directory scanning. Some
time ago there was scratchbuf implemented, which dynamically
reallocates its buffer on demand. The patch takes it in use for
the scanning code also. The initial size is hardcoded to 256
bytes which sounds good enough for most usecases so there should
be not many reallocations.
Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
Yauheni Kaliuta [Tue, 9 May 2017 19:09:21 +0000 (22:09 +0300)]
depmod: create depmod dir independent search function
Prepare to implement external directories support.
The patch splits depmod_modules_search() function to two
functions: depmod_modules_search(), called by the high level with
intention to search all possible modules, and
depmod_module_search_path(), which takes path as a parameter and
scans modules under the path only. Initially it is used to scan
the same depmod->cfg->dirname path only.
Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
Yauheni Kaliuta [Wed, 23 Nov 2016 15:23:38 +0000 (17:23 +0200)]
depmod: search key: move builtin detection under the add function
Prepare to implement external directories support.
It's better to isolate behaviour difference under the
cfg_search_add() call, then make the client code aware of it.
In case of external modules/directories support, there will be
one more keyword added, so making the clients aware of it makes
even less sense.
Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
Yauheni Kaliuta [Mon, 20 Mar 2017 10:09:51 +0000 (12:09 +0200)]
depmod: fix errorpath memleaks in report cycles logic
The
c7ce9f0c80f3d561078a78205a14c5ba7663cfdd commit (depmod:
handle nested loops) introduced a bunch of possible memory leaks
in error path. In the real world scenario it is not a problem,
since the utility quits if it detects any of the errors, but from
the programming point of view, it is not nice. So, add the
cleanups.
Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
Yauheni Kaliuta [Tue, 11 Apr 2017 12:15:03 +0000 (15:15 +0300)]
libkmod: modinfo: implement signature output
Signature was ignored from the modinfo. Implement its parsing
from the module data and add its output to the modinfo utility.
Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
Yauheni Kaliuta [Tue, 11 Apr 2017 12:15:02 +0000 (15:15 +0300)]
libkmod: modinfo: implement line splitting in hex_to_str
The key output is usually short, but for signature it is more
readable to output it in several lines.
Implement line splitting. Set line limit hardcoded to 20 hex
numbers (not characters).
Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
Yauheni Kaliuta [Tue, 11 Apr 2017 12:15:01 +0000 (15:15 +0300)]
libkmod: modinfo: use own function for sig_key hex output
Refactor the code a bit to make it easier to extend for signature
output.
kmod_module_get_info() creats a hex string for the sig_key data
inplace. Separate it into own kmod_module_hex_to_string function
and handle the branch in the new kmod_module_info_append_hex,
keeping the same signature as the non-hex version.
Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
Yauheni Kaliuta [Tue, 11 Apr 2017 12:15:00 +0000 (15:15 +0300)]
libkmod: modinfo: fix sig_id output
For some reason the key for sig_id was set to "signature". The
length was calculated against the proper string, as the result in
the output it was truncated to "signat".
Pass the proper key to the kmod_module_info_append() call.
Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
Lucas De Marchi [Fri, 24 Feb 2017 07:32:51 +0000 (23:32 -0800)]
kmod 24
Lucas De Marchi [Fri, 24 Feb 2017 05:58:15 +0000 (21:58 -0800)]
build: update autogen
Bring new options from systemd and other projects.
Lucas De Marchi [Fri, 24 Feb 2017 05:47:37 +0000 (21:47 -0800)]
depmod: fix leak on error path
Lucas De Marchi [Fri, 24 Feb 2017 02:28:27 +0000 (18:28 -0800)]
man: make error message clearer for missing xstlproc
We can't do at configure phase since we actually ship the built man pages with
dist, so it's fine not having xsltproc if building from dist. If building from
the repository, it's better to have have a better message saying xsltproc was
not found than trying to execute the argument to xsltproc. Now message is:
XSLT depmod.d.5
/bin/sh: line 1: xsltproc: command not found
Instead of:
XSLT depmod.d.5
/bin/sh: --nonet: command not found
Lucas De Marchi [Fri, 24 Feb 2017 02:26:54 +0000 (18:26 -0800)]
build: add missing header
Fix failing distcheck
Yauheni Kaliuta [Wed, 22 Feb 2017 09:41:59 +0000 (11:41 +0200)]
depmod: handle nested loops
This is a rework of depmod report cycles logic to make it
tolerant to more complex loops.
The patch tries to remember own path for vertexes which makes it
possible to handle configurations with common edges and
non-cyclic modules.
It assumes that the previous dependency calculations can not give
as input something like
mod_a -> mod_b -> <loop>, but
<loop> -> mod_a -> mod_b should be fine.
Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
Yauheni Kaliuta [Wed, 22 Feb 2017 09:41:58 +0000 (11:41 +0200)]
testsuite: depmod: check netsted loops reporting
The patch adds nested loops configuration for the loop test:
mod-loop-h -> mod-loop-i -> mod-loop-j -> mod-loop-k
^ | |
--------------------------- |
| |
-------------------------------------------
making 2 loops with common edges:
mod-loop-h -> mod-loop-i -> mod-loop-j -> mod-loop-h
mod-loop-h -> mod-loop-i -> mod-loop-j -> mod-loop-k -> mod-loop-h
The actual output for the loops is:
depmod: ERROR: Cycle detected: mod_loop_h -> mod_loop_h
depmod: ERROR: Cycle detected: mod_loop_i -> mod_loop_j -> mod_loop_k -> mod_loop_h -> mod_loop_i
(the order in the second doesn't matter, but the first one is
incorrect)
Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
Lucas De Marchi [Thu, 16 Feb 2017 17:18:35 +0000 (09:18 -0800)]
libkmod-config: fix parsing quoted kernel cmdline on params
We can only accept quoted values, not module names or parameter names.
Lucas De Marchi [Thu, 16 Feb 2017 16:57:01 +0000 (08:57 -0800)]
libkmod-config: replace 0/1 with bool
Bartosz Golaszewski [Wed, 15 Feb 2017 11:18:03 +0000 (12:18 +0100)]
module: fix a memory leak
When a module is removed and re-inserted without unrefing, the
kmod_file is unconditionally re-opened. This results in a memory
and file descriptor leak.
Fix it by checking if the file is already open in
kmod_module_insert_module().
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Lucas De Marchi [Mon, 23 Jan 2017 19:59:31 +0000 (11:59 -0800)]
testsuite: add test for kernel cmdline with quotes
Add some tests in which we quotes in kernel cmdline and also spaces
inside quotes. This doesn't yet cover the case in which quotes are used
for module name, wihch should be forbidden.
Lucas De Marchi [Mon, 23 Jan 2017 19:58:29 +0000 (11:58 -0800)]
testsuite: fix typo in description
James Minor [Fri, 20 Jan 2017 23:15:50 +0000 (17:15 -0600)]
libkmod: Fix handling of quotes in kernel command line
If a module parameter on the command line contains quotes, any
spaces inside those quotes should be included as part of the
parameter.
Signed-off-by: James Minor <james.minor@ni.com>
Lucas De Marchi [Fri, 11 Nov 2016 01:37:04 +0000 (23:37 -0200)]
build: fix build with disabled test modules
install: cannot stat 'testsuite/module-playground/mod-loop-f.ko': No
such file or directory
Makefile:2881: recipe for target 'rootfs' failed
make[1]: *** [rootfs] Error 1
make[1]: *** Waiting for unfinished jobs....
Makefile:2101: recipe for target 'check-recursive' failed
We need to ship pre-compiled binaries so it's possible to run
"make check" on servers without kernel headers.
Also add them to EXTRA_DIST as other sources.
Yauheni Kaliuta [Wed, 9 Nov 2016 06:52:26 +0000 (08:52 +0200)]
shared: make scratchbuf_str static
It fixes linking problem
tools/depmod.o: In function `output_symbols_bin':
depmod.c:(.text.output_symbols_bin+0x135): undefined reference to `scratchbuf_str'
for -O0 build, where gcc doesn't actually inline it.
Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
Mian Yousaf Kaukab [Tue, 8 Nov 2016 16:45:50 +0000 (17:45 +0100)]
depmod: ignore related modules in depmod_report_cycles
Only print actual cyclic dependencies. Print count of all the modules
in cyclic dependency at the end of the function so that dependent
modules which are not in cyclic chain can be ignored.
Printing dependent modules which are not in cyclic chain causes buffer
overflow as m->modnamesz is not included in buffer size calculations
(loop == m is never true). This buffer overflow causes kmod to crash.
Update depmod test to reflect the change as well.
Reported-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Mian Yousaf Kaukab <yousaf.kaukab@suse.com>
Mian Yousaf Kaukab [Tue, 8 Nov 2016 16:45:49 +0000 (17:45 +0100)]
testsuite: depmod: add module dependency outside cyclic chain
Check that depmod do not report modules outside cyclic chain
Two modules f and g are added which do not have any dependency.
modules a and b are made dependent on f and g.
Here is the output of loop dependency check test after adding this
patch:
TESTSUITE: ERR: wrong:
depmod: ERROR: Found 7 modules in dependency cycles!
depmod: ERROR: Cycle detected: mod_loop_d -> mod_loop_e -> mod_loop_d
depmod: ERROR: Cycle detected: mod_loop_b -> mod_loop_c -> mod_loop_a -> mod_loop_b
depmod: ERROR: Cycle detected: mod_loop_b -> mod_loop_c -> mod_loop_a -> mod_loop_g
depmod: ERROR: Cycle detected: mod_loop_b -> mod_loop_c -> mod_loop_a -> mod_loop_f
Buffer overflow occurs in the loop when last two lines are printed.
43 bytes buffer is allocated and 53 bytes are used.
Signed-off-by: Mian Yousaf Kaukab <yousaf.kaukab@suse.com>
Yauheni Kaliuta [Tue, 8 Nov 2016 20:57:26 +0000 (22:57 +0200)]
testsuite: fix test_array_sort pointers inderection
The array elements in the tests are strings, what means "char *"
in С. The comparation funtion takes pointers to the elements, so
the arguments become "char **". It means, that strcmp() cannot be
used directrly.
The patch creates a wrapper on strcmp() which perfoms
dereferencing of the "char **" to supply the actual strings to
strcmp(), and uses the wrapper as a comparation function for the
qsort() call.
Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
Lucas De Marchi [Wed, 10 Aug 2016 18:33:18 +0000 (15:33 -0300)]
depmod: fix string overflow
Use scratchbuf to fix issue with strcpy that may overflow the buffer we
declared in the stack.
Lucas De Marchi [Wed, 10 Aug 2016 17:20:32 +0000 (14:20 -0300)]
Add scratchbuf implementation
This should fill the requirements for "we need to loop over a lot of
strings that usually are small enough to remain on stack, but we want to
protect ourselves against huge strings not fitting in the static
buffer we estimated as sufficient"
Lucas De Marchi [Wed, 10 Aug 2016 17:51:57 +0000 (14:51 -0300)]
testsuite: include stdio.h
It's used in the log macros so include it.
Lucas De Marchi [Wed, 10 Aug 2016 15:42:12 +0000 (12:42 -0300)]
util: fix warning of equal values on logical OR
shared/util.c: In function ‘read_str_safe’:
shared/util.c:211:24: warning: logical ‘or’ of equal expressions [-Wlogical-op]
if (errno == EAGAIN || errno == EWOULDBLOCK ||
^~
shared/util.c: In function ‘write_str_safe’:
shared/util.c:237:24: warning: logical ‘or’ of equal expressions [-Wlogical-op]
if (errno == EAGAIN || errno == EWOULDBLOCK ||
^~
This is because EAGAIN and EWOULDBLOCK have the same value. Prefer
EAGAIN, but add a static assert to catch if it's not the same in another
architecture.
Lucas De Marchi [Mon, 8 Aug 2016 14:42:52 +0000 (11:42 -0300)]
libkmod: fix use of strcpy
We were not checking if there was sufficient space in the buffer.
Lucas De Marchi [Wed, 20 Jul 2016 04:38:42 +0000 (01:38 -0300)]
kmod 23
Lucas De Marchi [Tue, 28 Jun 2016 18:28:47 +0000 (15:28 -0300)]
NEWS: add items for kmod 23
Lucas De Marchi [Tue, 28 Jun 2016 15:14:38 +0000 (12:14 -0300)]
libkmod: fix integration with gtk-doc
It was failing to generate doc with recent version of gtk-doc
[kmod]$ ./bootstrap
libkmod/docs/gtk-doc.make:33: error: EXTRA_DIST must be set with '=' before using '+='
libkmod/docs/Makefile.am:29: 'libkmod/docs/gtk-doc.make' included from here
autoreconf: automake failed with exit status: 1
Just add an empty EXTRA_DIST so it works.
Lucas De Marchi [Sun, 5 Jun 2016 03:09:22 +0000 (00:09 -0300)]
libkmod-module: modinfo: print signature id
This way it's possible to give at least the signature type for PKCS#7.
Lucas De Marchi [Sun, 5 Jun 2016 03:00:57 +0000 (00:00 -0300)]
libkmod-signature: handle PKCS#7
Lucas De Marchi [Sun, 5 Jun 2016 01:37:11 +0000 (22:37 -0300)]
libkmod-module: do not crash modinfo on 0 key id len
Michal Marek [Fri, 17 Jun 2016 14:04:15 +0000 (16:04 +0200)]
libkmod: Handle long lines in /proc/modules
kmod_module_new_from_loaded() calls fgets with a 4k buffer. When a
module such as usbcore is used by too many modules, the rest of the line
is considered a beginning of another lines and we eventually get errors
like these from lsmod:
libkmod: kmod_module_get_holders: could not open '/sys/module/100,/holders': No such file or directory
together with bogus entries in the output. In kmod_module_get_size, the
problem does not affect functionality, but the line numbers in error
messages will be wrong.
Signed-off-by: Michal Marek <mmarek@suse.com>
Anton Blanchard [Fri, 10 Jun 2016 05:24:30 +0000 (15:24 +1000)]
depmod: Ignore PowerPC64 ABIv2 .TOC. symbol
The .TOC. symbol on the PowerPC64 ABIv2 identifies the GOT
pointer, similar to how other architectures use _GLOBAL_OFFSET_TABLE_.
This is not a symbol that needs relocation, and should be ignored
by depmod.
Lucas De Marchi [Tue, 24 May 2016 14:45:25 +0000 (11:45 -0300)]
README: add link to patchwork
Héctor Orón Martínez [Mon, 2 May 2016 14:38:24 +0000 (16:38 +0200)]
kmod: compiling with old sed version (!ERE support)
Makefile.am uses `sed -E', which it is found on BSD sed; however a
replacement on GNU sed would be `sed -r'. Both intend to use extended
regular expressions (ERE). However I have a system that does not support
those, in benefit for portability could you consider replacing ERE by BRE.
Signed-off-by: Héctor Orón Martínez <hector.oron@gmail.com>
Peter Wu [Sat, 21 May 2016 11:15:19 +0000 (13:15 +0200)]
kmod_module_get_refcnt: fix documentation
Lucas De Marchi [Mon, 11 Jan 2016 12:48:33 +0000 (10:48 -0200)]
travis: workaround bug in environment setup
Travis is poluting the environment, particularly PYTHON_CFLAGS which
makes the build to fail. Just unset the variable since we don't want to
override these cflags.
Josh Triplett [Sun, 10 Jan 2016 15:10:25 +0000 (07:10 -0800)]
depmod: Don't insert comment in modules.devname if otherwise empty
This allows tools to detect the file as empty, such as via systemd's
ConditionFileNotEmpty.
Marc-Antoine Perennou [Fri, 20 Nov 2015 21:23:14 +0000 (22:23 +0100)]
insmod: fix wron fallthrough of -f
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Lucas De Marchi [Wed, 18 Nov 2015 00:12:07 +0000 (22:12 -0200)]
kmod 22
Philippe De Swert [Wed, 7 Oct 2015 15:36:58 +0000 (18:36 +0300)]
insmod: do support -f
The -f switch is accepted by insmod, but silently ignored. This
causes the user to wonder why things don't work. As insmod is
most often used with "evil" modules, -f is almost default and
thus needs to work.
Signed-off-by: Philippe De Swert <philippe.deswert@jollamobile.com>
Lucas De Marchi [Wed, 30 Sep 2015 18:28:24 +0000 (15:28 -0300)]
libkmod: export new kmod_get_dirname() function
Make sure it gets exported and add documentation.
Laura Abbott [Mon, 28 Sep 2015 22:39:14 +0000 (15:39 -0700)]
depmod: Don't fall back to uname on bad version
Currently, if a value that doesn't match a kernel version
("%u.%u") is passed in, depmod silently falls back to
using uname. Rather than try and work around the caller passing
bad data, just exit out instead.
Laura Abbott [Mon, 28 Sep 2015 22:39:13 +0000 (15:39 -0700)]
depmod: Remove unprinted debug messages
In between the start of the program and the call to log_setup_kmod_log,
the only messages that will be printed are the ones at or above the
global default level. Debug messages in this range will never be printed
so remove them.
Laura Abbott [Mon, 28 Sep 2015 22:39:12 +0000 (15:39 -0700)]
Change default log level
The default log level is currently LOG_ERR. Tools can override this
default but there is a non-trivial amount of setup that needs to
happen before the log level can be changed. Since tools may want to
use the warn level for things such as deprecated flags, change the
default to LOG_WARNING to ensure messages get printed.
Laura Abbott [Mon, 28 Sep 2015 22:39:11 +0000 (15:39 -0700)]
modprobe: Update error message when path is missing
Currently, modprobe fails with no output by default if the
search paths it tries are missing:
$ modprobe -S notakernel dm-crypt
$
$ modprobe -S notakernel lkjjweiojo
$
This is fairly cryptic and not at all obvious there is a problem
unless the error code is checked or verbose flags are used.
Update the error message to indicate a problem and print out the
directory that failed.
Laura Abbott [Mon, 28 Sep 2015 22:39:10 +0000 (15:39 -0700)]
README: Indicate cython requirements
The recommended flags require cython be installed to compile
successfully. Note this in the documentation.
Natanael Copa [Mon, 22 Jun 2015 12:09:17 +0000 (14:09 +0200)]
build: let sed use posix ERE instead of GNU extension
Use POSIX Extended Regular Expression (ERE) instead of the GNU extension
\| in the install-exec-hook. This makes it create the symlink properly
with busybox sed built with musl libc. It will silently create a broken
symlink otherwise.
Lucas De Marchi: fix up added newline.
Lucas De Marchi [Sat, 13 Jun 2015 21:29:47 +0000 (18:29 -0300)]
libkmod-module: fix return code in error path
ENOSYS is the wrong errno to return when we don't find a module in
kmod_module_insert_module(). Why is it there in the first place? This
goes back to kmod v1 when we couldn't load modules by names, but we
should give a path instead.
708624a ("ELF: initial support for modinfo and strip of modversions and
vermagic.") changed that so we do a lazy-search by the module path in
this function. Later f304afe ("Change error message to reflect
reality") fixed the log message but the return coded remained the same.
Lucas De Marchi [Thu, 11 Jun 2015 16:59:54 +0000 (13:59 -0300)]
Add README.md file with build details
Add the badges from semaphoreci and coverity and point people to the
README file with more information.
Lucas De Marchi [Tue, 9 Jun 2015 05:36:14 +0000 (02:36 -0300)]
kmod 21
Lucas De Marchi [Tue, 9 Jun 2015 05:03:36 +0000 (02:03 -0300)]
build: add cache to distributed files
We were missing the cache directory on the distributed files.
Lucas De Marchi [Tue, 9 Jun 2015 05:01:11 +0000 (02:01 -0300)]
build: silence stderr on coverity rules
We try to execute git in order to get the dependencies for the coverity
rules. And it gets executed even when we are not calling that specific
rule. Later we may want to improve it, but for now let's just silence
the errors of not being a git repository when executing this on a
packaged version.
Santiago Vila [Tue, 9 Jun 2015 01:46:42 +0000 (22:46 -0300)]
kmod: fix small typo in rmmod(8)
This is how rmmod(8) looks like:
SEE ALSO
modprobe(8), insmod(8), lsmod(8)modinfo(8)
The attached trivial patch fixes it:
SEE ALSO
modprobe(8), insmod(8), lsmod(8), modinfo(8)
Lucas De Marchi [Sun, 7 Jun 2015 05:46:22 +0000 (02:46 -0300)]
tools: display features in --version
Reviewed-by: Andreas Mohr <andim2@users.sf.net>
Lucas De Marchi [Sun, 7 Jun 2015 05:44:02 +0000 (02:44 -0300)]
build: add relevant features to KMOD_FEATURES in config.h
Not all the features (i.e. those available in --enable-* or --with-*)
are really relevant to the final user. Create a KMOD_FEATURES definition
in config.h containing these features.
Reviewed-by: Andreas Mohr <andim2@users.sf.net>
Lucas De Marchi [Sun, 7 Jun 2015 04:15:30 +0000 (01:15 -0300)]
build: add function to build string of features
Add a CC_FEATURE_APPEND function that we can use to append the features
that are enabled/disabled. This will generate a single string in the
form "+FEATURE1 +FEATURE2 -FEATURE3".
Reviewed-by: Andreas Mohr <andim2@users.sf.net>
Lucas De Marchi [Tue, 9 Jun 2015 00:30:11 +0000 (21:30 -0300)]
tools: add PACKAGE definition in message
Reported-by: Andreas Mohr <andim2@users.sf.net>
Lucas De Marchi [Sun, 7 Jun 2015 02:26:31 +0000 (23:26 -0300)]
tools: Hide new commands behind experimental flag
Hide the commands behind a flag so we can continue doing releases while
the commands aren't ready.
Lucas De Marchi [Sun, 31 May 2015 18:38:47 +0000 (15:38 -0300)]
build: cache modules from playground
Now that we are able to build our own test modules, also allow to use
cached modules so a) kernel headers are not required and b) distro
maintainers are happy. It's still need a "--disable-test-modules" in
the configure since the default is enabled.
There's no license problems anymore since all modules come from our own
repository, we ship the sources and the modules can be easily rebuilt.
Santiago Vila [Thu, 16 Apr 2015 11:44:22 +0000 (08:44 -0300)]
Fix spurious spaces in lsmod output
While using "localyesconfig" to build a custom kernel I noticed that
lsmod output now has trailing spaces when the list of "Used by" modules
is empty.
The following patch just delays the space to the point where we are sure
that there are more things to print.
Lucas De Marchi [Tue, 24 Mar 2015 02:47:23 +0000 (23:47 -0300)]
util: use UINT64_MAX
Since we are checking the size of long and long long, use UINT64_MAX in
the fallback to be sure thre right size is being used.
Lucas De Marchi [Tue, 10 Mar 2015 18:17:03 +0000 (15:17 -0300)]
build: sync dolt with upstream
Caio Marcelo de Oliveira Filho [Sat, 7 Mar 2015 13:32:53 +0000 (10:32 -0300)]
tools: add basic versions of insert and remove
Caio Marcelo de Oliveira Filho [Thu, 5 Mar 2015 16:06:38 +0000 (13:06 -0300)]
testsuite: update README