Karel Zak [Mon, 17 Apr 2023 11:06:01 +0000 (13:06 +0200)]
Merge branch 'libblkid/crc32c-exclude' of https://github.com/t-8ch/util-linux
* 'libblkid/crc32c-exclude' of https://github.com/t-8ch/util-linux:
libblkid: xfs: clean up call to ul_crc32_exclude_offset
libblkid: erofs: calculate checksum with offset
Karel Zak [Mon, 17 Apr 2023 10:29:40 +0000 (12:29 +0200)]
hwclock: use kernel struct rtc_time for RTC ioctls
Based on patch from Matt Nourse.
Addresses: https://github.com/util-linux/util-linux/pull/2123 Reported-by: Matthew Nourse <matthew@nplus1.com.au> Signed-off-by: Karel Zak <kzak@redhat.com>
Karel Zak [Mon, 17 Apr 2023 09:41:02 +0000 (11:41 +0200)]
Merge branch 'lsfd--raspberrypi-32bit' of https://github.com/masatake/util-linux
* 'lsfd--raspberrypi-32bit' of https://github.com/masatake/util-linux:
tests: (lsfd) don't hardcode the inode number of netns in the expected output
tests: (lsfd) adjust the output for unix datagram sockets already connected
tests: (lsfd) adjust the output for unix datagram sockets created by socketpair
tests: (lsfd) check the exit status of the first command in the pipeline
tests: (lsfd) adjust the output for unix stream sockets
Karel Zak [Mon, 17 Apr 2023 09:25:09 +0000 (11:25 +0200)]
Merge branch 'fadvise/fixes' of https://github.com/t-8ch/util-linux
* 'fadvise/fixes' of https://github.com/t-8ch/util-linux:
fadvise: always exit with EXIT_FAILURE on error
fadvise: (man) document help and version arguments
fadvise: correctly report error from posix_fadvise
fadvise: implement --advice argument
Karel Zak [Mon, 17 Apr 2023 08:57:45 +0000 (10:57 +0200)]
Merge branch 'correct_blkid_xfs_output' of https://github.com/jlinton/util-linux
* 'correct_blkid_xfs_output' of https://github.com/jlinton/util-linux:
libblkid: Compute CRC with sb_crc zeroed
lib: Add crc32c function that can deal with holes
tests: (lsfd) adjust the output for unix datagram sockets already connected
Though older kernels report such sockets as "unconnected" via /proc/net/unix,
the newer kernels report them as "connected". The change is introduced in
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=83301b5367a98c17ec0d76c7bc0ccdc3c7e7ad6d
This caused a failure in a test case. To avoid the failure,
this change rewrites "unconnected" in the lsfd's output to "connected".
tests: (lsfd) adjust the output for unix datagram sockets created by socketpair
Though older kernels report such sockets as "unconnected" via /proc/net/unix,
the newer kernels report them as "connected". The change is introduced in
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=83301b5367a98c17ec0d76c7bc0ccdc3c7e7ad6d
This caused a failure in a test case. To avoid the failure,
this change rewrites "state=unconnected" in the lsfd's output
to "state=connected".
tests: (lsfd) adjust the output for unix stream sockets
lsfd changes the output of NAME column for a unix stream socket
whether the kernel reports it is a "UNIX-STREAM" socket or a "UNIX"
socket. Rather older version of kernels report the socket "UNIX"
For "UNIX", lsfd appends "type=stream" to the NAME column.
This caused a failure in test cases. To avoid the failure,
this change strips "type=stream" from the output before
comparing the output strings and expected strings.
Jeremy Linton [Fri, 14 Apr 2023 21:25:28 +0000 (16:25 -0500)]
libblkid: Compute CRC with sb_crc zeroed
The Linux kernel computes the sb_crc by crcing the
superblock with the CRC field set to 0. The code is
trying to avoid doing this in three separate CRC calls
like the kernel performs by simply zeroing the field
and making a single call.
Except that the passed copy "ondisk" isn't the same
as the returned copy "csummed" so the zeroing goes into
the wrong buffer. Meaning that the CRC is computed
incorrectly. This results in blkid returning:
Which can result in lots of failures including boot
failures if XFS modules aren't placed into the initrd,
or scripts/etc cannot determine the fs UUID.
Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
Jeremy Linton [Fri, 14 Apr 2023 23:07:29 +0000 (18:07 -0500)]
lib: Add crc32c function that can deal with holes
XFS, and possibly other filesystems expect that the CRC field
is excluded (or rather RAZ) during the CRC operation. Lets
create a generic helper that is similar to the CRC32 version
ul_crc32_exclude_offset() which computes the CRC while replacing
exclude_len bytes of exclude_off with zeros.
Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
Karel Zak [Tue, 11 Apr 2023 10:04:30 +0000 (12:04 +0200)]
Merge branch 'hwclock/cleanup' of https://github.com/t-8ch/util-linux
* 'hwclock/cleanup' of https://github.com/t-8ch/util-linux:
hwclock: use linux/rtc.h
hwclock: drop ancient sparc special cases
hwclock: constify struct clock_opts
hwclock: (tests) add simple test to show rtc time
Karel Zak [Wed, 5 Apr 2023 19:44:55 +0000 (21:44 +0200)]
libmount: fix superblock rw/ro reconfiguration
The classic mount(2) defaults to 'rw', but the new API does not reset
superblock to 'rw' if the flag is not explicitly used for
FSCONFIG_CMD_RECONFIGURE.
Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=2180593 Signed-off-by: Karel Zak <kzak@redhat.com>
For a long time, since commit 607ca46e97a1 ("UAPI: (Scripted) Disintegrate include/linux")
the kernel provided a dedicate uapi include for RTC definitions.
This makes the comment linux/mc146818rtc.h obsolete.
nsenter: use explicit argument to follow target PID/GID
Making the argument to -S and -G optional in #2092 broke the cli
compatability.
So replace it with an explicit "follow" argument that provides the new
functionality with a compatible interface.
Stephen Kitt [Sat, 25 Mar 2023 08:30:22 +0000 (09:30 +0100)]
mount: relatime allows equality
relatime also updates atime if the previous atime is equal to one or
both of the ctime and mtime; a non-strict interpretation of "earlier
than" allows this, but for clarity, this makes it explicit.
Pointed out by "epiii2" and "ctrl-alt-delor" in
https://unix.stackexchange.com/q/740862/86440.
Ronan Pigott [Thu, 23 Mar 2023 22:18:00 +0000 (15:18 -0700)]
hexdump-parse: handle truncated format pattern
If the fmt being parsed by block_size is exactly '%', *++fmt is the
terminator and strchr will return a valid pointer to the terminator of
spec rather than NULL, the while condition will pass and subsequent
strchr will read past the end of fmt until a spec character is found
again
ASAN aborts with the following error on the first buffer overread:
AddressSanitizer: heap-buffer-overflow on address 0x602000000212 at pc 0x55bf1c4b2d78 bp 0x7ffe33c8cff0 sp 0x7ffe33c8cfe0
READ of size 1 at 0x602000000212 thread T0
#0 0x55bf1c4b2d77 in block_size ../text-utils/hexdump-parse.c:207
#1 0x55bf1c4ad36f in main ../text-utils/hexdump.c:214
#2 0x7f15f063c78f (/usr/lib/libc.so.6+0x2378f)
#3 0x7f15f063c849 in __libc_start_main (/usr/lib/libc.so.6+0x23849)
#4 0x55bf1c4ac6c4 in _start (../build/hexdump+0x86c4)
Karel Zak [Thu, 23 Mar 2023 20:19:11 +0000 (21:19 +0100)]
Merge branch 'xry111/lscpu-loongarch' of https://github.com/xry111/util-linux
* 'xry111/lscpu-loongarch' of https://github.com/xry111/util-linux:
lscpu: Add loongarch testcase
lscpu: Add "ISA" field into lscpu_cputype and determine loongarch op-mode from its value
lscpu: Parse loongarch specific lines
Karel Zak [Thu, 23 Mar 2023 14:25:00 +0000 (15:25 +0100)]
libmount: fix MS_REMOUNT emulation by mount_setattr()
The classic mount(MS_REMOUNT) means that all unspecified MS_NOxxx
flags are remove (except MS_NOATIME). We need to follow this semantic
when emulate remount by mount_setattr(), because "mount -o remount /"
is the way how (for example) systemd resets root filesystem to default
(e.g. ro->rw, etc.)
Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=2180593 Signed-off-by: Karel Zak <kzak@redhat.com>
Xi Ruoyao [Wed, 22 Mar 2023 12:44:19 +0000 (20:44 +0800)]
lscpu: Parse loongarch specific lines
/proc/cpuinfo on loongarch uses UPPERCASE letters in some field names.
Add the patterns for them.
"Address Sizes", "CPU Family", "CPU Revision" (aka "Model"), and
"Model Name" are correctly outputed, but "CPU MHz" not (because we
don't have a CPUFreq driver yet).
projects / thirdparty / util-linux.git / log
