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
MFC after: 2 weeks
Submitted by: Thomas Schmitt <scdbackup@gmx.net>
Coverity CID: 1008927
Sponsored by: EMC / Isilon Storage Division

diff --git a/usr.sbin/makefs/cd9660/iso9660_rrip.c b/usr.sbin/makefs/cd9660/iso9660_rrip.c
index 5382857c6ac7064cf5ea0ad30019f75db4ffc4f2..749747ba5bd1f89054f56de57e25486a25c164f0 100644 (file)
--- 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;
 }