misc: surface_sam: Update based on module

Update Surface System Aggregator Module driver based on module. Changes: - Fix a memory allocation bug causing crashes through memory corruption and invalid access. Links: - SAM: linux-surface/surface-aggregator-module@9f9a5fc
linux-surface · Sep 19, 2020 · 47d0191 · 47d0191
1 parent a604178
commit 47d0191
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/drivers/misc/surface_aggregator/controller.c b/drivers/misc/surface_aggregator/controller.c
@@ -1467,7 +1467,7 @@ int ssam_request_sync_alloc(size_t payload_len, gfp_t flags,
 {
 	size_t msglen = SSH_COMMAND_MESSAGE_LENGTH(payload_len);
 
-	*rqst = kzalloc(sizeof(*rqst) + msglen, flags);
+	*rqst = kzalloc(sizeof(**rqst) + msglen, flags);
 	if (!*rqst)
 		return -ENOMEM;
 

diff --git a/drivers/misc/surface_aggregator/ssh_request_layer.c b/drivers/misc/surface_aggregator/ssh_request_layer.c
@@ -1,10 +1,12 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <asm/unaligned.h>
 #include <linux/atomic.h>
 #include <linux/completion.h>
 #include <linux/error-injection.h>
 #include <linux/ktime.h>
 #include <linux/list.h>
+#include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/types.h>
 #include <linux/workqueue.h>