Re: kern/48852 CD9660 RockRidge: device files not properly handled

["Thomas Schmitt" <scdbackup%gmx.net@localhost>]

The following reply was made to PR kern/48852; it has been noted by GNATS.

From: "Thomas Schmitt" <scdbackup%gmx.net@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: kern/48852 CD9660 RockRidge: device files not properly handled
Date: Fri, 30 May 2014 14:38:27 +0200

 --- usr.sbin/makefs/cd9660/iso9660_rrip.c.orig 2013-07-30 16:02:23.000000000 
+0000
 +++ usr.sbin/makefs/cd9660/iso9660_rrip.c      2014-05-30 12:25:40.000000000 
+0000
 @@ -657,13 +657,14 @@ cd9660node_rrip_pn(struct ISO_SUSP_ATTRI
        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,
 -                  pn_field->attr.rr_entry.PN.high);
 +      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;
  }