diff --git a/drivers/Kconfig b/drivers/Kconfig
index dcecc9f6e33f..9a177a02c371 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -234,5 +234,7 @@ source "drivers/interconnect/Kconfig"
 
 source "drivers/counter/Kconfig"
 
+source "drivers/corellium/Kconfig"
+
 source "drivers/most/Kconfig"
 endmenu
diff --git a/drivers/Makefile b/drivers/Makefile
index 576228037718..aefc1bbe9d15 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -188,4 +188,5 @@ obj-$(CONFIG_SIOX)	+= siox/
 obj-$(CONFIG_GNSS)		+= gnss/
 obj-$(CONFIG_INTERCONNECT)	+= interconnect/
 obj-$(CONFIG_COUNTER)		+= counter/
+obj-y				+= corellium/
 obj-$(CONFIG_MOST)		+= most/
diff --git a/drivers/platform/goldfish/goldfish_pipe.c b/drivers/platform/goldfish/goldfish_pipe.c
index 1ab207ec9c94..c6a6c80c8a47 100644
--- a/drivers/platform/goldfish/goldfish_pipe.c
+++ b/drivers/platform/goldfish/goldfish_pipe.c
@@ -87,7 +87,7 @@ struct goldfish_pipe_command {
	s32 cmd;	/* PipeCmdCode, guest -> host */
	s32 id;		/* pipe id, guest -> host */
	s32 status;	/* command execution status, host -> guest */
-	s32 reserved;	/* to pad to 64-bit boundary */
+	s32 container_id;
	union {
		/* Parameters for PIPE_CMD_{READ,WRITE} */
		struct {
@@ -734,6 +734,7 @@ static int goldfish_pipe_open(struct inode *inode, struct file *file)
 
	dev->pipes[id] = pipe;
	pipe->id = id;
+	pipe->command_buffer->container_id = 0;
	pipe->command_buffer->id = id;
 
	/* Now tell the emulator we're opening a new pipe. */