patch-2.1.9 linux/arch/sparc/prom/bootstr.c

• Lines: 84
• Date: Sat Nov 9 10:12:23 1996
• Orig file: v2.1.8/linux/arch/sparc/prom/bootstr.c
• Orig date: Sun Apr 21 12:30:32 1996

diff -u --recursive --new-file v2.1.8/linux/arch/sparc/prom/bootstr.c linux/arch/sparc/prom/bootstr.c
@@ -1,50 +1,67 @@
-/* $Id: bootstr.c,v 1.5 1996/04/04 16:30:53 tridge Exp $
+/* $Id: bootstr.c,v 1.11 1996/07/27 05:02:06 zaitcev Exp $
  * bootstr.c:  Boot string/argument acquisition from the PROM.
  *
  * Copyright(C) 1995 David S. Miller (davem@caip.rutgers.edu)
  */
 
 #include <linux/config.h>
+#include <linux/string.h>
 #include <asm/oplib.h>
 
-static char barg_buf[256];
+#define BARG_LEN  256
+static char barg_buf[BARG_LEN];
+static char fetched = 0;
 
 char *
 prom_getbootargs(void)
 {
 	int iter;
-	char *cp;
+	char *cp, *arg;
+
+	/* This check saves us from a panic when bootfd patches args. */
+	if (fetched) {
+		return barg_buf;
+	}
 
 	switch(prom_vers) {
 	case PROM_V0:
 		cp = barg_buf;
-		for(iter = 0; iter < 8; iter++) {
-			strcpy(cp, (*(romvec->pv_v0bootargs))->argv[iter]);
-			cp += strlen(cp); *cp++=' ';
+		/* Start from 1 and go over fd(0,0,0)kernel */
+		for(iter = 1; iter < 8; iter++) {
+			arg = (*(romvec->pv_v0bootargs))->argv[iter];
+			if(arg == 0) break;
+			while(*arg != 0) {
+				/* Leave place for space and null. */
+				if(cp >= barg_buf + BARG_LEN-2){
+					/* We might issue a warning here. */
+					break;
+				}
+				*cp++ = *arg++;
+			}
+			*cp++ = ' ';
 		}
 		*cp = 0;
 		break;
 	case PROM_V2:
 	case PROM_V3:
-		cp = barg_buf;
-		strcpy(cp, *romvec->pv_v2bootargs.bootpath);
-		cp += strlen(cp);
-		*cp++ = ' ';
-		strcpy(cp, *romvec->pv_v2bootargs.bootargs);
-		cp += strlen(cp);
-		*cp = 0;
+		/*
+		 * V3 PROM cannot supply as with more than 128 bytes
+		 * of an argument. But a smart bootstrap loader can.
+		 */
+		strncpy(barg_buf, *romvec->pv_v2bootargs.bootargs, BARG_LEN-1);
 		break;
         case PROM_AP1000:
 	  /*
 	   * Get message from host boot process.
 	   */
 #if CONFIG_AP1000
-                ap_getbootargs(barg_buf);
-#endif          
+                ap_getbootargs(barg_buf, BARG_LEN);
+#endif
                 break;
 	default:
-		barg_buf[0] = 0;
 		break;
 	}
+
+	fetched = 1;
 	return barg_buf;
 }