kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(cpio): correct dev_t -> rmajor/rminor mapping 

dev_t -> major/minor number mapping is more complicated than the
incorrect major=(dev_t >> 8) minor=(dev_t & 0xff) mapping that we
currently perform. Fix mapping to match Linux / glibc behaviour.

Fixes: https://github.com/dracutdevs/dracut/issues/1695
Reported-by: Ethan Wu <ethanwu10@gmail.com>
Signed-off-by: David Disseldorp <ddiss@suse.de>
master
David Disseldorp 2022-02-10 20:08:11 +01:00 committed by Jóhann B. Guðmundsson
parent 8bd7ddf819
commit acc629abb0
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/dracut-cpio/src/main.rs
View File

@ -361,9 +361,12 @@ fn archive_path<W: Seek + Write>(
// no zero terminator for symlink target path
}

// Linux kernel uses 32-bit dev_t, encoded as mmmM MMmm. glibc uses 64-bit
// MMMM Mmmm mmmM MMmm, which is compatible with the former.
if ftype.is_block_device() || ftype.is_char_device() {
rmajor = (md.rdev() >> 8) as u32;
rminor = (md.rdev() & 0xff) as u32;
let rd = md.rdev();
rmajor = (((rd >> 32) & 0xfffff000) | ((rd >> 8) & 0x00000fff)) as u32;
rminor = (((rd >> 12) & 0xffffff00) | (rd & 0x000000ff)) as u32;
}

if ftype.is_file() {