gpg-opencl: Bugfix for worksize limit

magnumripper · magnumripper · commit eb7682ffcff0 · 2025-08-20T23:50:43.000+02:00
Bug found after bumping work size during self-test.
diff --git a/src/opencl_gpg_fmt_plug.c b/src/opencl_gpg_fmt_plug.c
@@ -121,7 +121,12 @@ static const char *warn[] = {
 /* ------- Helper functions ------- */
 static size_t get_task_max_work_group_size()
 {
-	return autotune_get_task_max_work_group_size(FALSE, 0, crypt_kernel);
+	size_t s;
+
+	s = autotune_get_task_max_work_group_size(FALSE, 0, crypt_kernel);
+	s = MIN(s, autotune_get_task_max_work_group_size(FALSE, 0, crypt_kernel_sha256));
+	s = MIN(s, autotune_get_task_max_work_group_size(FALSE, 0, crypt_kernel_sha512));
+	return s;
 }
 
 static void release_clobj(void);

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,12 @@ static const char *warn[] = {`
`121`	`121`	`/* ------- Helper functions ------- */`
`122`	`122`	`static size_t get_task_max_work_group_size()`
`123`	`123`	`{`
`124`		`- return autotune_get_task_max_work_group_size(FALSE, 0, crypt_kernel);`
	`124`	`+ size_t s;`
	`125`	`+`
	`126`	`+ s = autotune_get_task_max_work_group_size(FALSE, 0, crypt_kernel);`
	`127`	`+ s = MIN(s, autotune_get_task_max_work_group_size(FALSE, 0, crypt_kernel_sha256));`
	`128`	`+ s = MIN(s, autotune_get_task_max_work_group_size(FALSE, 0, crypt_kernel_sha512));`
	`129`	`+ return s;`
`125`	`130`	`}`
`126`	`131`
`127`	`132`	`static void release_clobj(void);`