[125678kqv][cl]: fix sprint() and strcpy() buffer overflows

1 files changed, 44 insertions, 45 deletions

diff --git a/sys/src/cmd/vl/list.c b/sys/src/cmd/vl/list.c
index 9261bc8e1..75ced908e 100644
--- a/sys/src/cmd/vl/list.c
+++ b/sys/src/cmd/vl/list.c
@@ -20,7 +20,7 @@ prasm(Prog *p)
 int
 Pconv(Fmt *fp)
 {
-	char str[STRINGSZ], *s;
+	char str[STRINGSZ];
 	Prog *p;
 	int a;
 
@@ -28,22 +28,21 @@ Pconv(Fmt *fp)
 	curp = p;
 	a = p->as;
 	if(a == ADATA || a == ADYNT || a == AINIT)
-		sprint(str, "(%ld)	%A	%D/%d,%D",
+		snprint(str, sizeof str, "(%ld)	%A	%D/%d,%D",
 			p->line, a, &p->from, p->reg, &p->to);
 	else{
-		s = str;
-		s += sprint(s, "(%ld)", p->line);
-		if(p->mark & NOSCHED)
-			s += sprint(s, "*");
 		if(p->reg == NREG)
-			sprint(s, "	%A	%D,%D",
+			snprint(str, sizeof str, "(%ld)%s	%A	%D,%D",
+				p->line, p->mark & NOSCHED ? "*" : "",
 				a, &p->from, &p->to);
 		else
 		if(p->from.type != D_FREG)
-			sprint(s, "	%A	%D,R%d,%D",
+			snprint(str, sizeof str, "(%ld)%s	%A	%D,R%d,%D",
+				p->line, p->mark & NOSCHED ? "*" : "",
 				a, &p->from, p->reg, &p->to);
 		else
-			sprint(s, "	%A	%D,F%d,%D",
+			snprint(str, sizeof str, "(%ld)%s	%A	%D,F%d,%D",
+				p->line, p->mark & NOSCHED ? "*" : "",
 				a, &p->from, p->reg, &p->to);
 	}
 	return fmtstrcpy(fp, str);
@@ -73,68 +72,68 @@ Dconv(Fmt *fp)
 	switch(a->type) {
 
 	default:
-		sprint(str, "GOK-type(%d)", a->type);
+		snprint(str, sizeof str, "GOK-type(%d)", a->type);
 		break;
 
 	case D_NONE:
 		str[0] = 0;
 		if(a->name != D_NONE || a->reg != NREG || a->sym != S)
-			sprint(str, "%N(R%d)(NONE)", a, a->reg);
+			snprint(str, sizeof str, "%N(R%d)(NONE)", a, a->reg);
 		break;
 
 	case D_CONST:
-		sprint(str, "$%N", a);
+		snprint(str, sizeof str, "$%N", a);
 		if(a->reg != NREG)
-			sprint(str, "%N(R%d)(CONST)", a, a->reg);
+			snprint(str, sizeof str, "%N(R%d)(CONST)", a, a->reg);
 		break;
 
 	case D_OCONST:
-		sprint(str, "$*$%N", a);
+		snprint(str, sizeof str, "$*$%N", a);
 		if(a->reg != NREG)
-			sprint(str, "%N(R%d)(CONST)", a, a->reg);
+			snprint(str, sizeof str, "%N(R%d)(CONST)", a, a->reg);
 		break;
 
 	case D_OREG:
 		if(a->reg != NREG)
-			sprint(str, "%N(R%d)", a, a->reg);
+			snprint(str, sizeof str, "%N(R%d)", a, a->reg);
 		else
-			sprint(str, "%N", a);
+			snprint(str, sizeof str, "%N", a);
 		break;
 
 	case D_REG:
-		sprint(str, "R%d", a->reg);
+		snprint(str, sizeof str, "R%d", a->reg);
 		if(a->name != D_NONE || a->sym != S)
-			sprint(str, "%N(R%d)(REG)", a, a->reg);
+			snprint(str, sizeof str, "%N(R%d)(REG)", a, a->reg);
 		break;
 
 	case D_MREG:
-		sprint(str, "M%d", a->reg);
+		snprint(str, sizeof str, "M%d", a->reg);
 		if(a->name != D_NONE || a->sym != S)
-			sprint(str, "%N(R%d)(REG)", a, a->reg);
+			snprint(str, sizeof str, "%N(R%d)(REG)", a, a->reg);
 		break;
 
 	case D_FREG:
-		sprint(str, "F%d", a->reg);
+		snprint(str, sizeof str, "F%d", a->reg);
 		if(a->name != D_NONE || a->sym != S)
-			sprint(str, "%N(R%d)(REG)", a, a->reg);
+			snprint(str, sizeof str, "%N(R%d)(REG)", a, a->reg);
 		break;
 
 	case D_FCREG:
-		sprint(str, "FC%d", a->reg);
+		snprint(str, sizeof str, "FC%d", a->reg);
 		if(a->name != D_NONE || a->sym != S)
-			sprint(str, "%N(R%d)(REG)", a, a->reg);
+			snprint(str, sizeof str, "%N(R%d)(REG)", a, a->reg);
 		break;
 
 	case D_LO:
-		sprint(str, "LO");
+		snprint(str, sizeof str, "LO");
 		if(a->name != D_NONE || a->sym != S)
-			sprint(str, "%N(LO)(REG)", a);
+			snprint(str, sizeof str, "%N(LO)(REG)", a);
 		break;
 
 	case D_HI:
-		sprint(str, "HI");
+		snprint(str, sizeof str, "HI");
 		if(a->name != D_NONE || a->sym != S)
-			sprint(str, "%N(HI)(REG)", a);
+			snprint(str, sizeof str, "%N(HI)(REG)", a);
 		break;
 
 	case D_BRANCH:	/* botch */
@@ -143,22 +142,22 @@ Dconv(Fmt *fp)
 			if(v >= INITTEXT)
 				v -= INITTEXT-HEADR;
 			if(a->sym != S)
-				sprint(str, "%s+%.5lux(BRANCH)", a->sym->name, v);
+				snprint(str, sizeof str, "%s+%.5lux(BRANCH)", a->sym->name, v);
 			else
-				sprint(str, "%.5lux(BRANCH)", v);
+				snprint(str, sizeof str, "%.5lux(BRANCH)", v);
 		} else
 			if(a->sym != S)
-				sprint(str, "%s+%ld(APC)", a->sym->name, a->offset);
+				snprint(str, sizeof str, "%s+%ld(APC)", a->sym->name, a->offset);
 			else
-				sprint(str, "%ld(APC)", a->offset);
+				snprint(str, sizeof str, "%ld(APC)", a->offset);
 		break;
 
 	case D_FCONST:
-		sprint(str, "$%e", ieeedtod(a->ieee));
+		snprint(str, sizeof str, "$%e", ieeedtod(a->ieee));
 		break;
 
 	case D_SCONST:
-		sprint(str, "$\"%S\"", a->sval);
+		snprint(str, sizeof str, "$\"%S\"", a->sval);
 		break;
 	}
 	return fmtstrcpy(fp, str);
@@ -175,39 +174,39 @@ Nconv(Fmt *fp)
 	s = a->sym;
 	switch(a->name) {
 	default:
-		sprint(str, "GOK-name(%d)", a->name);
+		snprint(str, sizeof str, "GOK-name(%d)", a->name);
 		break;
 
 	case D_NONE:
-		sprint(str, "%ld", a->offset);
+		snprint(str, sizeof str, "%ld", a->offset);
 		break;
 
 	case D_EXTERN:
 		if(s == S)
-			sprint(str, "%ld(SB)", a->offset);
+			snprint(str, sizeof str, "%ld(SB)", a->offset);
 		else
-			sprint(str, "%s+%ld(SB)", s->name, a->offset);
+			snprint(str, sizeof str, "%s+%ld(SB)", s->name, a->offset);
 		break;
 
 	case D_STATIC:
 		if(s == S)
-			sprint(str, "<>+%ld(SB)", a->offset);
+			snprint(str, sizeof str, "<>+%ld(SB)", a->offset);
 		else
-			sprint(str, "%s<>+%ld(SB)", s->name, a->offset);
+			snprint(str, sizeof str, "%s<>+%ld(SB)", s->name, a->offset);
 		break;
 
 	case D_AUTO:
 		if(s == S)
-			sprint(str, "%ld(SP)", a->offset);
+			snprint(str, sizeof str, "%ld(SP)", a->offset);
 		else
-			sprint(str, "%s-%ld(SP)", s->name, -a->offset);
+			snprint(str, sizeof str, "%s-%ld(SP)", s->name, -a->offset);
 		break;
 
 	case D_PARAM:
 		if(s == S)
-			sprint(str, "%ld(FP)", a->offset);
+			snprint(str, sizeof str, "%ld(FP)", a->offset);
 		else
-			sprint(str, "%s+%ld(FP)", s->name, a->offset);
+			snprint(str, sizeof str, "%s+%ld(FP)", s->name, a->offset);
 		break;
 	}