Sat Jan 2 06:27:27 2010 UTC ()

Pull up following revision(s) (requested by tsutsui in ticket #1198):
	usr.sbin/makefs/cd9660/iso9660_rrip.c: revision 1.6
Fix another bug in SUSP "CE" handling: when the SUSP records fit into
the System Use field with fewer then 28 bytes to spare, we were
remembering the wrong length for the System Use field and hence
emitting a corrupt directory entry.  This could be triggered by trying
to build a filesystem containing a regular file with a 120-byte name.
Now we're a little more careful.


(snj)

diff -r1.4.20.1 -r1.4.20.2 src/usr.sbin/makefs/cd9660/iso9660_rrip.c

--- src/usr.sbin/makefs/cd9660/iso9660_rrip.c 2010/01/02 06:26:11	1.4.20.1
+++ src/usr.sbin/makefs/cd9660/iso9660_rrip.c 2010/01/02 06:27:27	1.4.20.2

 @@ -1,14 +1,14 @@
-/*	$NetBSD: iso9660_rrip.c,v 1.4.20.1 2010/01/02 06:26:11 snj Exp $	*/
+/*	$NetBSD: iso9660_rrip.c,v 1.4.20.2 2010/01/02 06:27:27 snj Exp $	*/
 /*
  * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
  * Perez-Rathke and Ram Vedam.  All rights reserved.
+ *
  * This code was written by Daniel Watt, Walter Deignan, Ryan Gabrys,
  * Alan Perez-Rathke and Ram Vedam.
+ *
  * Redistribution and use in source and binary forms, with or
  * without modification, are permitted provided that the following
  * conditions are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -33,27 +33,27 @@
  */
 /* This will hold all the function definitions
  * defined in iso9660_rrip.h
  */
 #include "makefs.h"
 #include "cd9660.h"
 #include "iso9660_rrip.h"
 #include <sys/queue.h>
 #include <stdio.h>
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: iso9660_rrip.c,v 1.4.20.1 2010/01/02 06:26:11 snj Exp $");
+__RCSID("$NetBSD: iso9660_rrip.c,v 1.4.20.2 2010/01/02 06:27:27 snj Exp $");
 #endif  /* !__lint */
 static void cd9660_rrip_initialize_inode(cd9660node *);
 static int cd9660_susp_handle_continuation(cd9660node *);
 static int cd9660_susp_handle_continuation_common(cd9660node *, int);
 int
 cd9660_susp_initialize(cd9660node *node, cd9660node *parent,
     cd9660node *grandparent)
+{
 	cd9660node *cn;
 	int r;
 @@ -190,56 +190,62 @@ cd9660_rrip_finalize_node(cd9660node *no
 			cd9660_bothendian_dword(
 				node->rr_real_parent->fileDataSector,
 				(unsigned char *)
 				    t->attr.rr_entry.PL.dir_loc);
 			break;
+		}
+	}
 	return 0;
+}
 static int
 cd9660_susp_handle_continuation_common(cd9660node *node, int space)
+{
-	int ca_used, susp_used, working;
+	int ca_used, susp_used, susp_used_last, working;
 	struct ISO_SUSP_ATTRIBUTES *temp, *last = NULL, *CE;
 	working = 254 - space;
 	/* printf("There are %i bytes to work with\n",working); */
 	susp_used = 0;
 	ca_used = 0;
 	TAILQ_FOREACH(temp, &node->head, rr_ll) {
 		if (working < 0)
 			break;
 		/*
 		 * printf("SUSP Entry found, length is %i\n",
 		 * CD9660_SUSP_ENTRY_SIZE(temp));
 		 */
 		working -= CD9660_SUSP_ENTRY_SIZE(temp);
 		if (working >= 0)
 			susp_used += CD9660_SUSP_ENTRY_SIZE(temp);
 		if (working >= 28) {
 			/*
 			 * Remember the last entry after which we
 			 * could insert a "CE" entry.
 			 */
 			last = temp;
-			susp_used += CD9660_SUSP_ENTRY_SIZE(temp);
+			susp_used_last = susp_used;
+		}
+	}
 	/* A CE entry is needed */
 	if (working <= 0) {
 		CE = cd9660node_susp_create_node(SUSP_TYPE_SUSP,
 			SUSP_ENTRY_SUSP_CE, "CE", SUSP_LOC_ENTRY);
 		cd9660_susp_ce(CE, node);
 		/* This will automatically insert at the appropriate location */
 		TAILQ_INSERT_AFTER(&node->head, last, CE, rr_ll);
-		susp_used += 28;
+		susp_used = susp_used_last + 28;
 		/* Count how much CA data is necessary */
 		for (temp = TAILQ_NEXT(CE, rr_ll); temp != NULL;
 		     temp = TAILQ_NEXT(temp, rr_ll)) {
 			ca_used += CD9660_SUSP_ENTRY_SIZE(temp);
+		}
+	}
 	node->susp_entry_size = susp_used;
 	node->susp_entry_ce_length = ca_used;
 	diskStructure.susp_continuation_area_size += ca_used;
 	return 1;