Merge: spi: fix null pointer dereference within spi_sync

zampierilucas · zampierilucas · commit 811e21caf2e2 · 2024-07-16T19:46:41.000Z
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/4649 JIRA: https://issues.redhat.com/browse/RHEL-39777 CVE: CVE-2024-36930 Signed-off-by: Andrew Halaney <ahalaney@redhat.com> Approved-by: Brian Masney <bmasney@redhat.com> Approved-by: Eric Chanudet <echanude@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Lucas Zampieri <lzampier@redhat.com>
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
@@ -4194,6 +4194,7 @@ static int __spi_sync(struct spi_device *spi, struct spi_message *message)
 		wait_for_completion(&done);
 		status = message->status;
 	}
+	message->complete = NULL;
 	message->context = NULL;
 
 	return status;

Original file line number	Diff line number	Diff line change
`@@ -4194,6 +4194,7 @@ static int __spi_sync(struct spi_device spi, struct spi_message message)`
`4194`	`4194`	`wait_for_completion(&done);`
`4195`	`4195`	`status = message->status;`
`4196`	`4196`	`}`
	`4197`	`+ message->complete = NULL;`
`4197`	`4198`	`message->context = NULL;`
`4198`	`4199`
`4199`	`4200`	`return status;`