Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PR kern/48787: inode calculation from ISO9660 block offset might get

Browse Source 
truncated to 32bit - force the whole expression to be evaluated as ino_t.
Patch from Thomas Schmitt, with minor modifications (and reworded comment).
This commit is contained in:
martin 2014-05-10 14:11:58 +00:00
parent b0897aba81
commit b31205ebbb
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/fs/cd9660/cd9660_node.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cd9660_node.c,v 1.30 2014/02/27 16:51:38 hannken Exp $ */
/* $NetBSD: cd9660_node.c,v 1.31 2014/05/10 14:11:58 martin Exp $ */
/*-
* Copyright (c) 1982, 1986, 1989, 1994
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cd9660_node.c,v 1.30 2014/02/27 16:51:38 hannken Exp $");
__KERNEL_RCSID(0, "$NetBSD: cd9660_node.c,v 1.31 2014/05/10 14:11:58 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -440,7 +440,14 @@ isodirino(struct iso_directory_record *isodir, struct iso_mnt *imp)
{
ino_t ino;
ino = (isonum_733(isodir->extent) + isonum_711(isodir->ext_attr_length))
<< imp->im_bshift;
return (ino);
/*
* Note there is an inverse calculation in
* cd9660_vfsops.c:cd9660_vget_internal():
* ip->iso_start = ino >> imp->im_bshift;
* and also a calculation of the isodir pointer
* from an inode in cd9660_vnops.c:cd9660_readlink()
*/
ino = ((ino_t)isonum_733(isodir->extent) +
isonum_711(isodir->ext_attr_length)) << imp->im_bshift;
return ino;
}