]> git.ipfire.org Git - thirdparty/util-linux.git/commit
libblkid: topology/ioctl: correctly handle kernel types
authorThomas Weißschuh <thomas@t-8ch.de>
Tue, 2 Apr 2024 16:55:29 +0000 (18:55 +0200)
committerKarel Zak <kzak@redhat.com>
Wed, 3 Apr 2024 12:11:50 +0000 (14:11 +0200)
commitc15085d00d88bf0cfb9043214d44ee542297d9ef
treec87f62834068b1d1f217ba0436c703f0ecf07af0
parent777cd421f2bc56c5d850d3231862225565a0f12e
libblkid: topology/ioctl: correctly handle kernel types

Commit 5d71d711d07a ("libblkid: topolicy/ioctl: use union for multiple data types")
incorrectly assumed that set_ulong and set_int refer to the type
returned by the kernel. Instead the different function pointer names
refer to the types of the function pointers.
However all ioctls, except for the later added BLKGETDISKSEQ, return
32bit integers.
This made libblkid also interpret the upper 32bits too, leading to
garbage values.

Introduce a new member 'kernel_size' to also handle the 64bit
BLKGETDISKSEQ.

Drop data.ul as it is no actually used.

Closes #2904
Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
(cherry picked from commit a10081a52c48a5232db30d8e0a7a7570cc8163ae)
libblkid/src/topology/ioctl.c