Merge pull request #1319 from martin-frbg/issue601

martin-frbg · web-flow · commit 97ecd4996a10 · 2017-10-08T23:31:06.000+02:00
Fix out-of-bounds memory accesses exposed by xccblat3 testcase
diff --git a/kernel/generic/ztrmm_utcopy_8.c b/kernel/generic/ztrmm_utcopy_8.c
@@ -823,7 +823,10 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	  b[  3] = *(a01 +  3);
 	  b += 4;
 	  }
-	} else {
+#if 1
+	} 
+#else
+	} else {	
 #ifdef UNIT
 	  b[ 0] = ONE;
 	  b[ 1] = ZERO;
@@ -835,6 +838,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON
 	  b[ 3] = *(a02 +  1);
 	  b += 4;
 	}
+#endif	
     posY += 2;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -823,7 +823,10 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON`
`823`	`823`	`b[ 3] = *(a01 + 3);`
`824`	`824`	`b += 4;`
`825`	`825`	`}`
`826`		`- } else {`
	`826`	`+#if 1`
	`827`	`+ }`
	`828`	`+#else`
	`829`	`+ } else {`
`827`	`830`	`#ifdef UNIT`
`828`	`831`	`b[ 0] = ONE;`
`829`	`832`	`b[ 1] = ZERO;`
`@@ -835,6 +838,7 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *a, BLASLONG lda, BLASLONG posX, BLASLON`
`835`	`838`	`b[ 3] = *(a02 + 1);`
`836`	`839`	`b += 4;`
`837`	`840`	`}`
	`841`	`+#endif`
`838`	`842`	`posY += 2;`
`839`	`843`	`}`
`840`	`844`