diff options
| author | ngie <ngie@FreeBSD.org> | 2015-11-09 09:03:24 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2015-11-09 09:03:24 +0000 |
| commit | e62170cbe6901f9dfd7b0c2432802bd616f560a4 (patch) | |
| tree | 59870632685d1e6a82e23ecd73935f7b66d3d806 /usr.sbin | |
| parent | d82b6ff9394b06eb2f31f5b1e9bfacacd4bc13e1 (diff) | |
| download | FreeBSD-src-e62170cbe6901f9dfd7b0c2432802bd616f560a4.zip FreeBSD-src-e62170cbe6901f9dfd7b0c2432802bd616f560a4.tar.gz | |
MFC r289899:
Import the fix from NetBSD kern/48852 (sic) to fix rockridge encoding of
device nodes
In particular, use st_rdev (the device type), not st_dev (the device inode),
and fix the comparison to be correct with the st_rdev field
Bug 203648
Submitted by: Thomas Schmitt <scdbackup@gmx.net>
Coverity CID: 1008927
Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/makefs/cd9660/iso9660_rrip.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/usr.sbin/makefs/cd9660/iso9660_rrip.c b/usr.sbin/makefs/cd9660/iso9660_rrip.c index 5382857..749747b 100644 --- a/usr.sbin/makefs/cd9660/iso9660_rrip.c +++ b/usr.sbin/makefs/cd9660/iso9660_rrip.c @@ -1,4 +1,4 @@ -/* $NetBSD: iso9660_rrip.c,v 1.11 2012/04/29 13:32:21 joerg Exp $ */ +/* $NetBSD: iso9660_rrip.c,v 1.14 2014/05/30 13:14:47 martin Exp $ */ /* * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan @@ -656,13 +656,14 @@ cd9660node_rrip_pn(struct ISO_SUSP_ATTRIBUTES *pn_field, fsnode *fnode) pn_field->attr.rr_entry.PN.h.length[0] = 20; pn_field->attr.rr_entry.PN.h.version[0] = 1; - if (sizeof (fnode->inode->st.st_dev) > 32) - cd9660_bothendian_dword((uint64_t)fnode->inode->st.st_dev >> 32, + if (sizeof (fnode->inode->st.st_rdev) > 4) + cd9660_bothendian_dword( + (uint64_t)fnode->inode->st.st_rdev >> 32, pn_field->attr.rr_entry.PN.high); else cd9660_bothendian_dword(0, pn_field->attr.rr_entry.PN.high); - cd9660_bothendian_dword(fnode->inode->st.st_dev & 0xffffffff, + cd9660_bothendian_dword(fnode->inode->st.st_rdev & 0xffffffff, pn_field->attr.rr_entry.PN.low); return 1; } |
