]> git.ipfire.org Git - thirdparty/util-linux.git/log
thirdparty/util-linux.git
4 years agofsck, libblkid: fix printf format string issue [coverity scan]
Sami Kerola [Sun, 9 Aug 2020 11:59:38 +0000 (12:59 +0100)] 
fsck, libblkid: fix printf format string issue [coverity scan]

According to coverirty a printf format string contains an unrecognized
format specifier (CWE-628).  Lets avoid glibc extension "%m" that is same
as "%s", strerror(errno).

CID: 360699
CID: 360718
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
4 years agonsenter / switch_root: fix insecure chroot [coverity scan]
Sami Kerola [Sun, 9 Aug 2020 11:51:11 +0000 (12:51 +0100)] 
nsenter / switch_root: fix insecure chroot [coverity scan]

If a call to chroot is not followed by a call to chdir("/") the chroot jail
confinement can be violated.  See also CWE-243.

CID: 360718
CID: 360800
Reference: http://cwe.mitre.org/data/definitions/243.html
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
4 years agologin: ensure getutxid() does not use uninitialized variable [coverity scan]
Sami Kerola [Sat, 8 Aug 2020 19:06:42 +0000 (20:06 +0100)] 
login: ensure getutxid() does not use uninitialized variable [coverity scan]

Field ut.ut_pid is uninitialized when calling getutxline().  The safest
option is to ensure all struct data is initialized in the function.

CID: 360793
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
4 years agolib/pager: fix improper use of negative value [coverity scan]
Sami Kerola [Sat, 8 Aug 2020 19:02:01 +0000 (20:02 +0100)] 
lib/pager: fix improper use of negative value [coverity scan]

The close(2) cannot accept a negative number.

CID: 360777
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
4 years agounshare: fix bad bit shift operation [coverity scan]
Sami Kerola [Sat, 8 Aug 2020 18:45:30 +0000 (19:45 +0100)] 
unshare: fix bad bit shift operation [coverity scan]

Variable cap was 32 bits and shifting it by 64 bits resulted to the shift
going over a variable boundary.

CID: 360799
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agohardlink: fix hardlink pcre leak
Sami Kerola [Sat, 8 Aug 2020 18:05:29 +0000 (19:05 +0100)] 
hardlink: fix hardlink pcre leak

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
4 years agocol: fix --help short option in usage() output
Sami Kerola [Wed, 14 Oct 2020 20:22:45 +0000 (21:22 +0100)] 
col: fix --help short option in usage() output

The col(1) is using unusual -H as --help short option.  The -h is used for
--tabs (horizontal tab?) in this implementation.

Fixes: 62dee0176a0c8e687d9ff0cb87342a0f8b893aaa
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
4 years agotests: update sfdisk wipe tests
Karel Zak [Fri, 16 Oct 2020 08:59:17 +0000 (10:59 +0200)] 
tests: update sfdisk wipe tests

Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agosfdisk: disable bootbits protection on '--wipe always'
Karel Zak [Thu, 15 Oct 2020 10:04:15 +0000 (12:04 +0200)] 
sfdisk: disable bootbits protection on '--wipe always'

Addresses: https://github.com/karelzak/util-linux/issues/1156
Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agomkfs.minix: add --lock and LOCK_BLOCK_DEVICE
Karel Zak [Wed, 14 Oct 2020 09:33:13 +0000 (11:33 +0200)] 
mkfs.minix: add --lock and LOCK_BLOCK_DEVICE

Addresses: https://github.com/karelzak/util-linux/issues/921
Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agoMerge branch 'master' of https://github.com/eric-simpson/util-linux
Karel Zak [Wed, 14 Oct 2020 08:24:25 +0000 (10:24 +0200)] 
Merge branch 'master' of https://github.com/eric-simpson/util-linux

* 'master' of https://github.com/eric-simpson/util-linux:
  do not require sys/syscall.h on non-linux platforms

4 years agoMerge branch 'dusty-remove-fstab-condition' of https://github.com/dustymabe/util...
Karel Zak [Wed, 14 Oct 2020 08:23:20 +0000 (10:23 +0200)] 
Merge branch 'dusty-remove-fstab-condition' of https://github.com/dustymabe/util-linux

* 'dusty-remove-fstab-condition' of https://github.com/dustymabe/util-linux:
  fstrim: remove fstab condition from fstrim.timer

4 years agodo not require sys/syscall.h on non-linux platforms
Eric Simpson [Tue, 13 Oct 2020 16:55:05 +0000 (12:55 -0400)] 
do not require sys/syscall.h on non-linux platforms

In order to build util-linux on other platforms (such as IBM i), do not require the linux-specific sys/syscall.h.

4 years agotests: update atari partx tests
Karel Zak [Tue, 13 Oct 2020 16:34:39 +0000 (18:34 +0200)] 
tests: update atari partx tests

Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agofstrim: remove fstab condition from fstrim.timer
Dusty Mabe [Tue, 13 Oct 2020 15:26:16 +0000 (11:26 -0400)] 
fstrim: remove fstab condition from fstrim.timer

In 9995da0 we added support to fstrim to be able to fall back to
`/proc/self/mountinfo` if `/etc/fstab` didn't exist, but we forgot
to remove the `/etc/fstab` condition from the timer. Let's remove
that condition from the timer so we can go back to periodically
running `fstrim.service`.

4 years agotests: update atari blkid tests
Karel Zak [Tue, 13 Oct 2020 14:29:19 +0000 (16:29 +0200)] 
tests: update atari blkid tests

The old images of the atari label are truncated and in-table stored
sizes do not match with real images sizes -- libblkid checks it now.

I have no idea how to generate ICD format, let's ignore it in tests
for now.

Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agolibblkid: make Atari more robust
Karel Zak [Tue, 13 Oct 2020 14:19:20 +0000 (16:19 +0200)] 
libblkid: make Atari more robust

* ignore large disks
* check in-table stored device size
* check bad sectors list
* check partition dimensions against in-table device size

Addresses: https://github.com/karelzak/util-linux/issues/1159
Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agolosetup: increase limit of setup attempts
Karel Zak [Tue, 13 Oct 2020 10:55:44 +0000 (12:55 +0200)] 
losetup: increase limit of setup attempts

Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agolosetup: avoid infinite busy loop
Karel Zak [Tue, 13 Oct 2020 08:31:42 +0000 (10:31 +0200)] 
losetup: avoid infinite busy loop

issue report:
 if i run the heavy duty test from #16859 a couple of times I can get
 the loopback layer in the kernel into a state where there's a loopback
 block device allocated, that you can open, but where both LOOP_CLR_FD
 and _SET_FD fail with EBUSY. and /dev/loop-control still returns it as
 the next free one...  weird state util-linux losetup when called to
 allocate a new device then freezes

This commit:
* restrict number of attempts to 16
* use 200000ms sleep between attempts
* add note about non-atomic loop device setup to the man page

Reported-by: Lennart Poettering <lennart@poettering.net>
Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agobash-completion: (lsblk) update columns
Karel Zak [Mon, 12 Oct 2020 11:19:35 +0000 (13:19 +0200)] 
bash-completion: (lsblk) update columns

and fix lsblk --help output

Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agolsblk: add --width option
Karel Zak [Mon, 12 Oct 2020 10:10:33 +0000 (12:10 +0200)] 
lsblk: add --width option

Addresses: https://github.com/karelzak/util-linux/issues/1160
Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agolib/sysfs: fix doble free [coverity scan]
Karel Zak [Fri, 9 Oct 2020 11:46:35 +0000 (13:46 +0200)] 
lib/sysfs: fix doble free [coverity scan]

Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agolibblkid: fix Atari prober logic
Karel Zak [Fri, 9 Oct 2020 11:06:08 +0000 (13:06 +0200)] 
libblkid: fix Atari prober logic

Addresses: https://github.com/karelzak/util-linux/issues/1159
Addresses: https://github.com/karelzak/util-linux/issues/1116
Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agolibblkid: use /sys to read all block devices
Karel Zak [Wed, 7 Oct 2020 11:49:45 +0000 (13:49 +0200)] 
libblkid: use /sys to read all block devices

The old implementation uses /proc/partitions where devices are
filtered by kernel (missing devices with ext_range=1 and removable
devices).

The problem with the old implementation is whole-disk heuristic based
on device name, order of devices, etc.

The new implementation use the same code to read also removable
devices.

Addresses: https://github.com/karelzak/util-linux/issues/1151
Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agobuild-sys: use _DATA to install getopt examples
Karel Zak [Tue, 6 Oct 2020 13:47:02 +0000 (15:47 +0200)] 
build-sys: use _DATA to install getopt examples

* rename the files to getopt-example.*
* use automake _DATA rather than _SCRIPT

Addresses: https://github.com/karelzak/util-linux/issues/1149
Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agodocs: add hint about make install-strip and link to Documentation/
Karel Zak [Tue, 6 Oct 2020 13:35:09 +0000 (15:35 +0200)] 
docs: add hint about make install-strip and link to Documentation/

Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agologin: move proctitle code to login.c
Karel Zak [Tue, 6 Oct 2020 13:13:29 +0000 (15:13 +0200)] 
login: move proctitle code to login.c

The functions are used only by login(1), let's keep the code in
login.c only.

Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agolib: add missing headers to .c files
Karel Zak [Tue, 6 Oct 2020 13:03:45 +0000 (15:03 +0200)] 
lib: add missing headers to .c files

Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agobuild-sys: exclude GPL from libcommon
Karel Zak [Tue, 6 Oct 2020 11:26:36 +0000 (13:26 +0200)] 
build-sys: exclude GPL from libcommon

The library is not distributed and almost all code in this ar(1)
archive is Public Domain or LGPL ... but let's avoid any doubts and do
not mix non-GPL and GPL code there.

Addresses: https://github.com/karelzak/util-linux/issues/1157
Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agolib/procutils: use Public Domain for this file
Karel Zak [Tue, 6 Oct 2020 11:15:29 +0000 (13:15 +0200)] 
lib/procutils: use Public Domain for this file

It's was originally GPL, but all the current code in the file is from
me and I don't think it makes sense to use GPL here anymore. We need
to use lib/ files in LGPL as well as in GPL binaries, etc. Let's makes
things (build-system) less complicated.

Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agolib/loopdev: cosmetic changes to LOOP_CONFIGURE
Karel Zak [Mon, 5 Oct 2020 11:49:16 +0000 (13:49 +0200)] 
lib/loopdev: cosmetic changes to LOOP_CONFIGURE

Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agoMerge branch 'frkaya/loopconfig' of https://github.com/franksinankaya/util-linux
Karel Zak [Mon, 5 Oct 2020 12:51:45 +0000 (14:51 +0200)] 
Merge branch 'frkaya/loopconfig' of https://github.com/franksinankaya/util-linux

* 'frkaya/loopconfig' of https://github.com/franksinankaya/util-linux:
  loopdev: use LOOP_CONFIG ioctl

4 years agoagetty: fix typo in manual page
Samanta Navarro [Sat, 3 Oct 2020 11:57:56 +0000 (11:57 +0000)] 
agetty: fix typo in manual page

4 years agologin: use mem2strcpy() rather than rely on printf()
Karel Zak [Thu, 1 Oct 2020 12:04:21 +0000 (14:04 +0200)] 
login: use mem2strcpy() rather than rely on printf()

The strings from utmp does not have to be terminated. It's seems
better to explicitly terminate it than rely on "%.*s" printf()
functionality -- printf() man page assumes that "If a precision is
given, no null byte need be present", but static analyzers are pretty
unhappy with it.

Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agohwclock: make tz use more robust [coverity scan]
Karel Zak [Thu, 1 Oct 2020 11:44:44 +0000 (13:44 +0200)] 
hwclock: make tz use more robust [coverity scan]

It's probably unnecessary, but let's make it more robust and keep
static analyzers happy.

Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agoscript: don't use strings from user as printf-format [coverity scan]
Karel Zak [Thu, 1 Oct 2020 11:29:46 +0000 (13:29 +0200)] 
script: don't use strings from user as printf-format [coverity scan]

Let's avoid format string vulnerability (TAINTED_STRING).

Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agolib/buffer: make it robust for static analyzers [coverity scan]
Karel Zak [Thu, 1 Oct 2020 11:23:34 +0000 (13:23 +0200)] 
lib/buffer: make it robust for static analyzers [coverity scan]

Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agochrt: don't restrict --reset-on-fork, add more info to man page
Karel Zak [Thu, 1 Oct 2020 09:20:01 +0000 (11:20 +0200)] 
chrt: don't restrict --reset-on-fork, add more info to man page

The flag works (= kernel accepts it) for all scheduling policies
and sched_getattr() returns the flag for all policies.

There is no reason for userspace to be more smart than kernel or hide
the flag when it prints sched_getattr()/sched_getscheduler() results.

 # chrt -v --reset-on-fork --batch 0 /bin/true
 pid 1315019's new scheduling policy: SCHED_BATCH|SCHED_RESET_ON_FORK

 # chrt -v --reset-on-fork --fifo 1 /bin/true
 pid 1315055's new scheduling policy: SCHED_FIFO|SCHED_RESET_ON_FORK

 # chrt -v --reset-on-fork --deadline --sched-period 10000 0 /bin/true
 pid 1315182's new scheduling policy: SCHED_DEADLINE|SCHED_RESET_ON_FORK

 # chrt -v --reset-on-fork --idle 0 /bin/true
 pid 1315247's new scheduling policy: SCHED_IDLE|SCHED_RESET_ON_FORK

 # chrt -v --reset-on-fork --rr 1 /bin/true
 pid 1315275's new scheduling policy: SCHED_RR|SCHED_RESET_ON_FORK

 # chrt -v --reset-on-fork --other 0 /bin/true
 pid 1315311's new scheduling policy: SCHED_OTHER|SCHED_RESET_ON_FORK

Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agochrt: (man) add human-readable names for policies
Karel Zak [Thu, 1 Oct 2020 09:04:29 +0000 (11:04 +0200)] 
chrt: (man) add human-readable names for policies

Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agochrt: use SCHED_FLAG_RESET_ON_FORK for sched_setattr()
Karel Zak [Thu, 1 Oct 2020 08:40:27 +0000 (10:40 +0200)] 
chrt: use SCHED_FLAG_RESET_ON_FORK for sched_setattr()

Reviewed by many people, used for years (but probably nobody uses
SCHED_DEADLINE with reset-on-fork), but we all missed:

- sched_setscheduler() uses SCHED_RESET_ON_FORK (0x40000000)
- sched_setattr() uses SCHED_FLAG_RESET_ON_FORK (0x01)

Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1883013
Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agoloopdev: use LOOP_CONFIG ioctl
Sinan Kaya [Wed, 30 Sep 2020 03:28:30 +0000 (03:28 +0000)] 
loopdev: use LOOP_CONFIG ioctl

Prefer to use the new LOOP_CONFIG ioctl.
https://lwn.net/Articles/820408/

Signed-off-by: Sinan Kaya <sinan.kaya@microsoft.com>
4 years agolscpu: don't use smbios when read snapshots
Karel Zak [Wed, 30 Sep 2020 12:57:08 +0000 (14:57 +0200)] 
lscpu: don't use smbios when read snapshots

Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agolib/buffer: fix end pointer initilaization
Karel Zak [Wed, 30 Sep 2020 12:35:33 +0000 (14:35 +0200)] 
lib/buffer: fix end pointer initilaization

Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agobuild-sys: add missing header file
Karel Zak [Wed, 30 Sep 2020 12:03:15 +0000 (14:03 +0200)] 
build-sys: add missing header file

Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agocol: enable deallocation on exit also for __SANITIZE_ADDRESS__
Karel Zak [Wed, 30 Sep 2020 11:47:35 +0000 (13:47 +0200)] 
col: enable deallocation on exit also for __SANITIZE_ADDRESS__

The macro FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION does not have to
enabled in all cases (e.g. default travis-ci, local tests, ...). It
seems more robust also check for __SANITIZE_ADDRESS__ too.

Addresses: https://github.com/karelzak/util-linux/pull/1115
Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agolibblkid: (gpt) accept tiny devices
Karel Zak [Wed, 30 Sep 2020 11:11:01 +0000 (13:11 +0200)] 
libblkid: (gpt) accept tiny devices

GPT prober reads 2 first sectors. There is no overhead as we already
read begin of the device for another filesystems (like FAT) and we
have these sectors already in memory.

Addresses: https://github.com/karelzak/util-linux/issues/1147
Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agolibfdisk: (gpt) reduce number of entries to fit small device
Karel Zak [Wed, 30 Sep 2020 10:38:59 +0000 (12:38 +0200)] 
libfdisk: (gpt) reduce number of entries to fit small device

The default is 128 partitions (entries in partitions array). The size
of the entry is 128 bytes, it means 32 sectors (512-byte) for the
array. The default is too large for tiny devices and it seems better to
dynamically reduce the number to fix the device size.

The reduction is reported to user.

Example:

 $ dd if=/dev/zero of=8-sectors.img count=8 bs=512
 $ fdisk 8-sectors.img
 ...
 Command (m for help): g
 Created a new GPT disklabel (GUID: 3DB3EECE-BCCA-6C46-95FA-7E23783BB3B2).
 The maximal number of partitions is 8 (default is 128).

 Command (m for help): x

 Expert command (m for help): p
 Disk 8-sectors.img: 4 KiB, 4096 bytes, 8 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes
 I/O size (minimum/optimal): 512 bytes / 512 bytes
 Disklabel type: gpt
 Disk identifier: 3DB3EECE-BCCA-6C46-95FA-7E23783BB3B2
 First LBA: 4
 Last LBA: 4
 Alternative LBA: 7
 Partition entries LBA: 2
 Allocated partition entries: 8

In this case, sectors:
 0   - PMBR
 1   - GPT header
 2-3 - GPT array of partitions (8 entries, 128 bytes each)
 4   - partition data
 5-6 - backup GPT array of partitions
 7   - backup GPT header

The smallest image is 6 sectors with 4 entries in array of partitions.

Note that Linux kernel has no problem to accept 4K image with 1
512-bytes GPT partition.

  # losetup -P -f 4K.img
  # lsblk /dev/loop0
  NAME      MAJ:MIN RM  SIZE RO TYPE MOUNTPOINT
  loop0       7:0    0    4K  0 loop
  â””─loop0p1 259:5    0  512B  0 part

... but we need to fix libblkid, it ignores so small devices to probe for GPT :)

Addresses: https://github.com/karelzak/util-linux/issues/1147
Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agofdisk: always report fdisk_create_disklabel() errors
Karel Zak [Wed, 30 Sep 2020 09:49:05 +0000 (11:49 +0200)] 
fdisk: always report fdisk_create_disklabel() errors

This is fdisk, cfdisk and sfdisk change to inform user about fdisk_create_disklabel()
issues.

Addresses: https://github.com/karelzak/util-linux/issues/1147
Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agolibfdisk: (gpt) make sure device is large enough
Karel Zak [Wed, 30 Sep 2020 09:44:03 +0000 (11:44 +0200)] 
libfdisk: (gpt) make sure device is large enough

The current code creates GPT header and partitions arrays (with 128
entries ...) although there is no space for all the stuff. This patch
forces fdisk_create_disklabel() to return -ENOSPC if the last and first
usable LBA calculation is out of device size.

Addresses: https://github.com/karelzak/util-linux/issues/1147
Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agolibblkid: improve debug for /proc/partitions
Karel Zak [Wed, 30 Sep 2020 09:37:09 +0000 (11:37 +0200)] 
libblkid: improve debug for /proc/partitions

Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agocol: cleanup usage() and struct col_*
Karel Zak [Tue, 29 Sep 2020 12:20:57 +0000 (14:20 +0200)] 
col: cleanup usage() and struct col_*

- remove extra line about stdout in usage() output

- use our macros to print int about --help and --version

- remove uint8_t bit-field from struct col_ctl (it seems fragile for
  future code changes).

Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agoMerge branch 'col-refactor' of https://github.com/kerolasa/util-linux
Karel Zak [Tue, 29 Sep 2020 11:41:00 +0000 (13:41 +0200)] 
Merge branch 'col-refactor' of https://github.com/kerolasa/util-linux

* 'col-refactor' of https://github.com/kerolasa/util-linux:
  col: replace LINE and CHAR typedefs with structs
  col: free memory before exit [LeakSanitizer]
  col: tidy up sources a little bit
  col: add defaults to switch case clauses
  col: flip all comparisions to numerical order
  col: use size_t when dealing with numbers that buffer sizes
  col: add structure to hold line variables
  col: add update_cur_line() function
  col: add handle_not_graphic() function
  col: initialize variables when they are declared
  col: move option handling to separate function
  col: move global variables to a control structure
  col: use inline function rather than function like define
  col: use typedef and enum to clarify struct
  col: remove function prototypes
  col: add more tests

4 years agolscpu: use SMBIOS tables on ARM for lscpu
Jeffrey Bastian [Tue, 29 Sep 2020 11:28:16 +0000 (13:28 +0200)] 
lscpu: use SMBIOS tables on ARM for lscpu

ARM SBBR (Sever Base Boot Requirements) require SMBIOS tables, and
SMBIOS Type 4 describes the CPU manufacturer and model name (among other
details).  If SMBIOS Type 4 is present, use it to extract these strings.

Example output (before and after the patch) on an HP m400, Lenovo HR330A,
and HPE Apollo 70:

[root@hp-m400 ~]# /usr/bin/lscpu | grep -i -e vendor -e model -e stepping
Vendor ID:           APM
Model:               1
Model name:          X-Gene
Stepping:            0x0
[root@hp-m400 ~]# ./lscpu | grep -i -e vendor -e model -e stepping
Vendor ID:                       AppliedMicro
Model:                           1
Model name:                      X-Gene
Stepping:                        0x0

[root@lenovo-hr330a ~]# /usr/bin/lscpu | grep -i -e vendor -e model -e stepping
Vendor ID:           APM
Model:               2
Model name:          X-Gene
Stepping:            0x3
[root@lenovo-hr330a ~]# ./lscpu | grep -i -e vendor -e model -e stepping
Vendor ID:                       Ampere(TM)
Model:                           2
Model name:                      eMAG
Stepping:                        0x3

[root@hpe-apollo-70 ~]# /usr/bin/lscpu | grep -i -e vendor -e model -e stepping
Vendor ID:           Cavium
Model:               1
Model name:          ThunderX2 99xx
Stepping:            0x1
[root@hpe-apollo-70 ~]# ./lscpu | grep -i -e vendor -e model -e stepping
Vendor ID:                       Cavium Inc.
Model:                           1
Model name:                      Cavium ThunderX2(R) CPU CN9980 v2.1 @ 2.20GHz
Stepping:                        0x1

[kzak@redhat.com: - move dmi_header to lscpu.h
                  - make arm_cpu_smbios() more robust for failed
    open() and read()
                  - use original arm_cpu_decode() also on failed
    arm_cpu_smbios()]

Signed-off-by: Jeffrey Bastian <jbastian@redhat.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agolscpu: Add FUJITSU aarch64 A64FX cpupart
Shunsuke Nakamura [Mon, 28 Sep 2020 09:46:14 +0000 (18:46 +0900)] 
lscpu: Add FUJITSU aarch64 A64FX cpupart

Add an entry for FUJITSU aarch64 part A64FX.
I tested it on the FX1000.

Signed-off-by: Shunsuke Nakamura <nakamura.shun@fujitsu.com>
4 years agocolumn: Deprecate --table-empty-lines in favor of --keep-empty-lines
Lennard Hofmann [Mon, 21 Sep 2020 16:26:00 +0000 (18:26 +0200)] 
column: Deprecate --table-empty-lines in favor of --keep-empty-lines

`--table-empty-lines` gives the false impression that the option
only applies to table mode.

Signed-off-by: Lennard Hofmann <lennard.hofmann@web.de>
4 years agocolumn: Optionally keep empty lines in cols/rows mode
Lennard Hofmann [Mon, 21 Sep 2020 16:16:20 +0000 (18:16 +0200)] 
column: Optionally keep empty lines in cols/rows mode

Signed-off-by: Lennard Hofmann <lennard.hofmann@web.de>
4 years agoMerge branch 'blockdev' of https://github.com/jwilk-forks/util-linux
Karel Zak [Tue, 29 Sep 2020 10:34:45 +0000 (12:34 +0200)] 
Merge branch 'blockdev' of https://github.com/jwilk-forks/util-linux

4 years agoMerge branch 'master' of https://github.com/tabraham/util-linux
Karel Zak [Tue, 29 Sep 2020 10:34:08 +0000 (12:34 +0200)] 
Merge branch 'master' of https://github.com/tabraham/util-linux

4 years agolibmount: optimize mnt_optstr_apply_flags()
Karel Zak [Tue, 29 Sep 2020 10:31:06 +0000 (12:31 +0200)] 
libmount: optimize mnt_optstr_apply_flags()

We append to the options string in loop there. It seems better to use
ul_buffer for this case to avoid duplicate strlen() and reallocs.

Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agolibmount: improve mnt_split_optstr() performance
Karel Zak [Fri, 25 Sep 2020 15:23:18 +0000 (17:23 +0200)] 
libmount: improve mnt_split_optstr() performance

This function is used by fstab (etc.) parser to split VFS, FS and
userspace options to separate lists. Unfortunately, the current
implementation reallocates the final string always when append a new
option to the string.

The new implementation pre-allocate memory for the final string
according to source string length (1/2 of the original string). This
dramatically reduces realloc() calls.

For example oss-fuzz (./test_mount_fuzz) uses 800K input string, old
version needs 28s to parse the string, new version 500ms.

Addresses: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=23861
Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agolib/buffer: add simple grow-able buffer
Karel Zak [Fri, 25 Sep 2020 15:21:57 +0000 (17:21 +0200)] 
lib/buffer: add simple grow-able buffer

The goal is to use it in libmount when generate options strings
and in libsmartcols to replace libscols_buffer.

Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agoblockdev: fix man page formatting
Jakub Wilk [Sat, 26 Sep 2020 16:15:42 +0000 (18:15 +0200)] 
blockdev: fix man page formatting

Signed-off-by: Jakub Wilk <jwilk@jwilk.net>
4 years agolibmount: (optstr) improve default initialization
Karel Zak [Fri, 25 Sep 2020 08:25:25 +0000 (10:25 +0200)] 
libmount: (optstr) improve default initialization

Don't use memset() if we can use compiler for the first
initialization.

Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agolscpu: avoid segfault on PowerPC systems with valid hardware configurations
Thomas Abraham [Thu, 24 Sep 2020 18:52:33 +0000 (14:52 -0400)] 
lscpu: avoid segfault on PowerPC systems with valid hardware configurations

ntypes greater than 1 is valid in some hardware configurations, and an assert()
on the value isn't necessary or very future proof

4 years agolsblk: fix SCSI_IDENT_SERIAL
Karel Zak [Thu, 24 Sep 2020 07:56:03 +0000 (09:56 +0200)] 
lsblk: fix SCSI_IDENT_SERIAL

It seems sg3_utils does not use ID_ prefix like other udev stuff.

Addresses: https://github.com/karelzak/util-linux/issues/1143
Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agosu: remove useless assignment
Karel Zak [Wed, 23 Sep 2020 14:54:34 +0000 (16:54 +0200)] 
su: remove useless assignment

Address: https://github.com/karelzak/util-linux/issues/1145
Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agolsblk: read ID_SCSI_IDENT_SERIAL if available
Karel Zak [Wed, 23 Sep 2020 13:41:05 +0000 (15:41 +0200)] 
lsblk: read ID_SCSI_IDENT_SERIAL if available

This SERIAL comes from sg3_utils.

Addresses: https://github.com/karelzak/util-linux/issues/1143
Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agolibfdisk: add "Linux /usr" and "Linux /usr verity" GPT partition types
nl6720 [Mon, 21 Sep 2020 15:20:16 +0000 (18:20 +0300)] 
libfdisk: add "Linux /usr" and "Linux /usr verity" GPT partition types

See https://systemd.io/DISCOVERABLE_PARTITIONS/ and https://github.com/systemd/systemd/pull/17101 .

Move ARM after x86-64, so that x86 and x86-64 are next to one another.

Signed-off-by: nl6720 <nl6720@gmail.com>
4 years agotests: update script(1) return code
Karel Zak [Mon, 21 Sep 2020 11:34:06 +0000 (13:34 +0200)] 
tests: update script(1) return code

Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agoscript: kill child process on error
Karel Zak [Mon, 21 Sep 2020 10:51:02 +0000 (12:51 +0200)] 
script: kill child process on error

The recent change in code improves main-pool on error, but we need
to kill child process if it still running to avoid hang up in next
waitpid().

Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agoscript: improve I/O return code checks
Soumendra Ganguly [Tue, 15 Sep 2020 14:14:59 +0000 (09:14 -0500)] 
script: improve I/O return code checks

Handle error based on return code of handle_io() and handle_signal().
Keep SIGTTIN unblocked during read() in handle_io().

Signed-off-by: Soumendra Ganguly <soumendraganguly@gmail.com>
4 years agodocs: add note about github
Karel Zak [Tue, 15 Sep 2020 07:01:13 +0000 (09:01 +0200)] 
docs: add note about github

Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agofallocate: fix --dig-holes at end of files
Gero Treuner [Thu, 10 Sep 2020 19:43:03 +0000 (21:43 +0200)] 
fallocate: fix --dig-holes at end of files

I discovered that making a file sparse with "fallocate -d filename"
fails on the last block of a file, because - usually being partial -
the system call only zeroes that part instead of deallocating the
block. See man fallocate(2) - section "Deallocating file space".

The expected call is punching the whole block beyond eof, which
doesn't change the file length because of flag FALLOC_FL_KEEP_SIZE.

Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agoMerge branch 'addCarmelLscpu' of https://github.com/tomoaki0705/util-linux
Karel Zak [Mon, 14 Sep 2020 08:49:28 +0000 (10:49 +0200)] 
Merge branch 'addCarmelLscpu' of https://github.com/tomoaki0705/util-linux

* 'addCarmelLscpu' of https://github.com/tomoaki0705/util-linux:
  add Carmel from NVIDIA

4 years agocol: replace LINE and CHAR typedefs with structs
Sami Kerola [Sat, 12 Sep 2020 18:18:36 +0000 (19:18 +0100)] 
col: replace LINE and CHAR typedefs with structs

Karel Zak said; typedef is evil, see reference.  I don't know are they evil,
but it is fair comment structs without hiding what is the data type is
easier and quicker understand when reading the code.

Reference: https://github.com/karelzak/util-linux/pull/1115#discussion_r481971317
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
4 years agocol: free memory before exit [LeakSanitizer]
Sami Kerola [Sat, 8 Aug 2020 15:49:09 +0000 (16:49 +0100)] 
col: free memory before exit [LeakSanitizer]

Clean up before exit to satisfy LeakSanitizer tests run by travis.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
4 years agocol: tidy up sources a little bit
Sami Kerola [Sun, 28 Jun 2020 16:59:59 +0000 (17:59 +0100)] 
col: tidy up sources a little bit

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
4 years agocol: add defaults to switch case clauses
Sami Kerola [Sun, 28 Jun 2020 16:08:47 +0000 (17:08 +0100)] 
col: add defaults to switch case clauses

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
4 years agocol: flip all comparisions to numerical order
Sami Kerola [Sun, 28 Jun 2020 12:24:28 +0000 (13:24 +0100)] 
col: flip all comparisions to numerical order

Left side is always smaller or equal to right side.  This makes reading code
quicker when not having to constantly swap where is the greater value.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
4 years agocol: use size_t when dealing with numbers that buffer sizes
Sami Kerola [Sun, 28 Jun 2020 11:54:24 +0000 (12:54 +0100)] 
col: use size_t when dealing with numbers that buffer sizes

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
4 years agocol: add structure to hold line variables
Sami Kerola [Sun, 28 Jun 2020 11:40:13 +0000 (12:40 +0100)] 
col: add structure to hold line variables

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
4 years agocol: add update_cur_line() function
Sami Kerola [Sun, 28 Jun 2020 11:20:03 +0000 (12:20 +0100)] 
col: add update_cur_line() function

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
4 years agocol: add handle_not_graphic() function
Sami Kerola [Sat, 27 Jun 2020 19:50:55 +0000 (20:50 +0100)] 
col: add handle_not_graphic() function

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
4 years agocol: initialize variables when they are declared
Sami Kerola [Sat, 27 Jun 2020 18:44:46 +0000 (19:44 +0100)] 
col: initialize variables when they are declared

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
4 years agocol: move option handling to separate function
Sami Kerola [Sat, 27 Jun 2020 18:32:25 +0000 (19:32 +0100)] 
col: move option handling to separate function

Mark --tabs and --spaces mutually exclusive in same go.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
4 years agocol: move global variables to a control structure
Sami Kerola [Sat, 27 Jun 2020 18:23:29 +0000 (19:23 +0100)] 
col: move global variables to a control structure

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
4 years agocol: use inline function rather than function like define
Sami Kerola [Sat, 27 Jun 2020 18:03:33 +0000 (19:03 +0100)] 
col: use inline function rather than function like define

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
4 years agocol: use typedef and enum to clarify struct
Sami Kerola [Sat, 27 Jun 2020 17:57:48 +0000 (18:57 +0100)] 
col: use typedef and enum to clarify struct

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
4 years agocol: remove function prototypes
Sami Kerola [Sat, 27 Jun 2020 17:40:44 +0000 (18:40 +0100)] 
col: remove function prototypes

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
4 years agocol: add more tests
Sami Kerola [Fri, 26 Jun 2020 21:24:25 +0000 (22:24 +0100)] 
col: add more tests

With these tests coverage is about 89%.

The ts_run is added to ensure ASAN_OPTIONS and UBSAN_OPTIONS are set
correctly when the tests run.

Reference: https://github.com/karelzak/util-linux/pull/1115#issuecomment-670140224
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
4 years agoadd Carmel from NVIDIA
Tomoaki Teshima [Fri, 11 Sep 2020 13:45:54 +0000 (22:45 +0900)] 
add Carmel from NVIDIA

4 years agoblkzone: add report capacity command
Hans Holmberg [Fri, 11 Sep 2020 08:47:23 +0000 (10:47 +0200)] 
blkzone: add report capacity command

Add a command that answers the the question:
"How much data can I store on this device/in this range of zones?"

Implement this by summing up zone capacities over the given range.

Signed-off-by: Hans Holmberg <hans.holmberg@wdc.com>
4 years agologin: add option to not reset username on each attempt
Thayne McCombs [Fri, 4 Sep 2020 08:33:54 +0000 (02:33 -0600)] 
login: add option to not reset username on each attempt

[kzak@redhat.com: - use different message on failed password]

Addresses: https://github.com/karelzak/util-linux/pull/1138
Addresses: https://github.com/karelzak/util-linux/issues/6
Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agomkswap: add --verbose, reduce extents check output
Karel Zak [Thu, 10 Sep 2020 10:54:14 +0000 (12:54 +0200)] 
mkswap: add --verbose, reduce extents check output

We do not need to provide details in the default output. It seems
better to hide it behind --verbose to be user-friendly.

Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agomkswap: cleanup usage()
Karel Zak [Thu, 10 Sep 2020 09:26:18 +0000 (11:26 +0200)] 
mkswap: cleanup usage()

- don't use one string for all --help output
- use USAGE_* macros

Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agomkswap: remove unnecessary on FS_IOC_FIEMAP
Karel Zak [Wed, 9 Sep 2020 13:50:39 +0000 (15:50 +0200)] 
mkswap: remove unnecessary on FS_IOC_FIEMAP

This is something user cannot fix and extents check is nothing critical.

Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agomkswap: improve extents check
Karel Zak [Wed, 9 Sep 2020 13:37:27 +0000 (15:37 +0200)] 
mkswap: improve extents check

- remove unknown extent type (kernel does not care about it too)
- fix last_logical use in messages
- improve warning for DELALLOC extents
- check for hole at the end of the file

Reported-by: Lukas Czerner <lczerner@redhat.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agolsblk: show all empty, except loopdevs
Karel Zak [Wed, 9 Sep 2020 12:50:02 +0000 (14:50 +0200)] 
lsblk: show all empty, except loopdevs

This patch improves the previous commit to accept also another empty devices.

Addresses: https://github.com/karelzak/util-linux/issues/1118
Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agolsblk: ignore only loopdevs without backing file
Karel Zak [Wed, 9 Sep 2020 10:18:07 +0000 (12:18 +0200)] 
lsblk: ignore only loopdevs without backing file

* do not ignore all empty devices, we need more smart solution

* ignore only loop devices without backing file, for example:
 # touch img
 # losetup -f img
 losetup: img: Warning: file is smaller than 512 bytes; the loop device may be useless or invisible for system tools.

 - old version display nothing
 - new version:

 # lsblk /dev/loop0
 NAME  MAJ:MIN RM SIZE RO TYPE MOUNTPOINT
 loop0   7:0    0   0B  0 loop

Addresses: https://github.com/karelzak/util-linux/issues/1118
Signed-off-by: Karel Zak <kzak@redhat.com>
4 years agolsblk: print zero rather than empty SIZE
Karel Zak [Wed, 9 Sep 2020 10:00:10 +0000 (12:00 +0200)] 
lsblk: print zero rather than empty SIZE

Addresses: https://github.com/karelzak/util-linux/issues/1118
Signed-off-by: Karel Zak <kzak@redhat.com>