| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20220227.042707.2131548399286487704.yamato@redhat.com>
Date: Sun, 27 Feb 2022 04:27:07 +0900 (JST)
From: Masatake YAMATO <yamato@...hat.com>
To: zeha@...ian.org
Cc: matorola@...il.com, kzak@...hat.com, linux-kernel@...r.kernel.org,
linux-fsdevel@...r.kernel.org, util-linux@...r.kernel.org
Subject: Re: [ANNOUNCE] util-linux v2.38-rc1
Sorry for being late.
> Hello Masatake YAMATO,
>
> Thank you for the followup.
>
> * Masatake YAMATO <yamato@...hat.com> [220204 19:03]:
>> > Could you tell me what kind of file system for /etc/passwd do you use for testing?
>
> sbuild/schroot can use different mechanisms, but in this case / is
> overlayfs (the underlying fs is ext4):
> unstable-amd64-sbuild on / type overlay (rw,relatime,...)
>
> ls -la /etc/passwd
> -rw-r--r-- 1 root root 2397 Feb 6 16:41 /etc/passwd
> stat /etc/passwd
> File: /etc/passwd
> Size: 2397 Blocks: 8 IO Block: 4096 regular file
> Device: 33h/51d Inode: 1311528 Links: 1
> Access: (0644/-rw-r--r--) Uid: ( 0/ root) Gid: ( 0/ root)
> Access: 2022-02-06 16:41:26.880589326 +0000
> Modify: 2022-02-06 16:41:26.720591039 +0000
> Change: 2022-02-06 16:41:26.720591039 +0000
> Birth: -
> mount
Thank you. I found this one was a critical hint for fixing.
The failure reports a bug of the test case, not a bug of lsfd command.
I made a new pull request for this bug: https://github.com/util-linux/util-linux/pull/1611.
Quoted from the pull request:
The original test cases depended on a wrong assumption; if M and M'
are the same, D and D' are the same, too. Here, M is a mnt_id in
/proc/$pid/mountinfo. D is the device number for M in
/proc/$pid/mountinfo. M' is the mnt_id value in
/proc/$pid/fdinfo/$fd. D' is the device number reported by stat
syscall for /proc/$pid/fd/$fd.
# ../../lsfd -oCOMMAND,PID,MNTID,DEV,NAME -p 2972623 -Q '(ASSOC =~ "^[0-9]+$") and (TYPE == "REG")'
COMMAND PID MNTID DEV NAME
a.out 2972623 1578 0:98 /home/jet/var/util-linux/o/merged/y
# stat -c %d /home/jet/var/util-linux/o/merged/y
98
# grep 1578 /proc/2972623/mountinfo
1578 91 0:91 / /home/jet/var/util-linux/o/merged rw,relatime shared:724 - overlay overlay rw,seclabel,lowerdir=lower-base/lower,upperdir=upper-base/upper,workdir=upper-base/work
The original test compared the device numbers reported by findmnt and
lsfd. findmnt retrieves a device number from /proc/$pid/mountinfo.
lsfd retrieves a device number from stat syscall.
This assumption is not correct for a file on an overlay file system
whose block devices behind lowerdir and upperdir are different.
Using findmnt is not suitable for comparing device numbers.
I expect the bug is fixed with the pull request.
Masatake YAMATO
>> As I commented on GitHub, I made a pull request for fixing this issue.
>> I found a bug in the test case, not in lsfd itself.
>>
>> https://github.com/util-linux/util-linux/pull/1595
>> https://github.com/util-linux/util-linux/pull/1595/commits/abd93fcecfbb1a1fac7032fac9d2903c5d2d3a38
>>
>> > When trying to reproduce the bug, could you applying the following change?
>
> I have applied abd93fcecfbb1a1fac7032fac9d2903c5d2d3a38 alone, which
> does not help in my case (DEV[STR] is 0 instead of 1).
>
> I have also applied #1595 in full in a second build, see output
> below.
>
> Many thanks,
> Chris
>
>
>
> script: /<<PKGBUILDDIR>>/tests/ts/lsfd/mkfds-ro-regular-file
> commands: /<<PKGBUILDDIR>>/
> helpers: /<<PKGBUILDDIR>>/
> sub dir: /<<PKGBUILDDIR>>/tests/ts/lsfd
> top dir: /<<PKGBUILDDIR>>/tests
> self: /<<PKGBUILDDIR>>/tests/ts/lsfd
> test name: mkfds-ro-regular-file
> test desc: read-only regular file
> component: lsfd
> namespace: lsfd/mkfds-ro-regular-file
> verbose: yes
> output: /<<PKGBUILDDIR>>/tests/output/lsfd/mkfds-ro-regular-file
> error log: /<<PKGBUILDDIR>>/tests/output/lsfd/mkfds-ro-regular-file.err
> exit code: /<<PKGBUILDDIR>>/tests/output/lsfd/mkfds-ro-regular-file.exit_code
> valgrind: /<<PKGBUILDDIR>>/tests/output/lsfd/mkfds-ro-regular-file.vgdump
> expected: /<<PKGBUILDDIR>>/tests/expected/lsfd/mkfds-ro-regular-file{.err}
> mountpoint: /<<PKGBUILDDIR>>/tests/output/lsfd/mkfds-ro-regular-file-mnt
>
> lsfd: read-only regular file ... FAILED (lsfd/mkfds-ro-regular-file)
> ========= script: /<<PKGBUILDDIR>>/tests/ts/lsfd/mkfds-ro-regular-file =================
> ================= OUTPUT =====================
> 1 ABC 3 r-- REG /etc/passwd 1
> 2 COMMAND,ASSOC,MODE,TYPE,NAME,POS: 0
> 3 PID[RUN]: 0
> 4 PID[STR]: 0
> 5 INODE[RUN]: 0
> 6 INODE[STR]: 0
> 7 UID[RUN]: 0
> 8 UID[STR]: 0
> 9 USER[RUN]: 0
> 10 USER[STR]: 0
> 11 SIZE[RUN]: 0
> 12 SIZE[STR]: 0
> 13 MNTID[RUN]: 0
> 14 DEV[RUN]: 0
> 15 FINDMNT[RUN]: 0
> 16 DEV[STR]: 1
> 17 MNTID: 312
> 18 DEV: 0:50
> 19 MNTID DEV: 312 0:50
> 20 FINDMNT_MNTID_DEV: 312 0:48
> ================= EXPECTED ===================
> 1 ABC 3 r-- REG /etc/passwd 1
> 2 COMMAND,ASSOC,MODE,TYPE,NAME,POS: 0
> 3 PID[RUN]: 0
> 4 PID[STR]: 0
> 5 INODE[RUN]: 0
> 6 INODE[STR]: 0
> 7 UID[RUN]: 0
> 8 UID[STR]: 0
> 9 USER[RUN]: 0
> 10 USER[STR]: 0
> 11 SIZE[RUN]: 0
> 12 SIZE[STR]: 0
> 13 MNTID[RUN]: 0
> 14 DEV[RUN]: 0
> 15 FINDMNT[RUN]: 0
> 16 DEV[STR]: 0
> ================= O/E diff ===================
> --- /<<PKGBUILDDIR>>/tests/output/lsfd/mkfds-ro-regular-file 2022-02-06 16:37:28.111146267 +0000
> +++ /<<PKGBUILDDIR>>/tests/expected/lsfd/mkfds-ro-regular-file 2022-01-31 14:57:47.000000000 +0000
> @@ -13,8 +13,4 @@
> MNTID[RUN]: 0
> DEV[RUN]: 0
> FINDMNT[RUN]: 0
> -DEV[STR]: 1
> -MNTID: 312
> -DEV: 0:50
> -MNTID DEV: 312 0:50
> -FINDMNT_MNTID_DEV: 312 0:48
> +DEV[STR]: 0
> ==============================================
>
> script: /<<PKGBUILDDIR>>/tests/ts/lsfd/mkfds-rw-character-device
> commands: /<<PKGBUILDDIR>>/
> helpers: /<<PKGBUILDDIR>>/
> sub dir: /<<PKGBUILDDIR>>/tests/ts/lsfd
> top dir: /<<PKGBUILDDIR>>/tests
> self: /<<PKGBUILDDIR>>/tests/ts/lsfd
> test name: mkfds-rw-character-device
> test desc: character device with O_RDWR
> component: lsfd
> namespace: lsfd/mkfds-rw-character-device
> verbose: yes
> output: /<<PKGBUILDDIR>>/tests/output/lsfd/mkfds-rw-character-device
> error log: /<<PKGBUILDDIR>>/tests/output/lsfd/mkfds-rw-character-device.err
> exit code: /<<PKGBUILDDIR>>/tests/output/lsfd/mkfds-rw-character-device.exit_code
> valgrind: /<<PKGBUILDDIR>>/tests/output/lsfd/mkfds-rw-character-device.vgdump
> expected: /<<PKGBUILDDIR>>/tests/expected/lsfd/mkfds-rw-character-device{.err}
> mountpoint: /<<PKGBUILDDIR>>/tests/output/lsfd/mkfds-rw-character-device-mnt
>
> lsfd: character device with O_RDWR ... FAILED (lsfd/mkfds-rw-character-device)
> ========= script: /<<PKGBUILDDIR>>/tests/ts/lsfd/mkfds-rw-character-device =================
> ================= OUTPUT =====================
> 1 3 rw- CHR /dev/zero mem:5 0 1:5 mem char 1:5
> 2 ASSOC,MODE,TYPE,NAME,SOURCE,POS,MAJ:MIN,CHRDRV,DEVTYPE,RDEV: 0
> 3 MNTID[RUN]: 0
> 4 DEV[RUN]: 0
> 5 FINDMNT[RUN]: 0
> 6 DEV[STR]: 1
> 7 MNTID: 312
> 8 DEV: 0:50
> 9 MNTID DEV: 312 0:50
> 10 FINDMNT_MNTID_DEV: 312 0:48
> ================= EXPECTED ===================
> 1 3 rw- CHR /dev/zero mem:5 0 1:5 mem char 1:5
> 2 ASSOC,MODE,TYPE,NAME,SOURCE,POS,MAJ:MIN,CHRDRV,DEVTYPE,RDEV: 0
> 3 MNTID[RUN]: 0
> 4 DEV[RUN]: 0
> 5 FINDMNT[RUN]: 0
> 6 DEV[STR]: 0
> ================= O/E diff ===================
> --- /<<PKGBUILDDIR>>/tests/output/lsfd/mkfds-rw-character-device 2022-02-06 16:37:28.675140230 +0000
> +++ /<<PKGBUILDDIR>>/tests/expected/lsfd/mkfds-rw-character-device 2022-01-31 14:57:47.000000000 +0000
> @@ -3,8 +3,4 @@
> MNTID[RUN]: 0
> DEV[RUN]: 0
> FINDMNT[RUN]: 0
> -DEV[STR]: 1
> -MNTID: 312
> -DEV: 0:50
> -MNTID DEV: 312 0:50
> -FINDMNT_MNTID_DEV: 312 0:48
> +DEV[STR]: 0
> ==============================================
>
Powered by blists - more mailing lists