From 67581c4b3d89fa034484d711c545526f5f52379e Mon Sep 17 00:00:00 2001
From: Siqi Lin <siqilin@google.com>
Date: Fri, 21 Jul 2017 20:58:46 +0000
Subject: [PATCH] Revert "dm ioctl: prevent stack leak in dm ioctl call"

This reverts commit 164de5751d0af059b146b44718c57cf2e3885df3.

Bug: 35644370
Change-Id: I13a9099f5e1270092d561c8fd53e35f627d7f710
Signed-off-by: Siqi Lin <siqilin@google.com>
---
 drivers/md/dm-ioctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index f21bc46cd1d2..81a79b739e97 100644
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -1767,7 +1767,7 @@ static int ctl_ioctl(uint command, struct dm_ioctl __user *user)
 	if (r)
 		goto out;
 
-	param->data_size = offsetof(struct dm_ioctl, data);
+	param->data_size = sizeof(*param);
 	r = fn(param, input_param_size);
 
 	if (unlikely(param->flags & DM_BUFFER_FULL_FLAG) &&
-- 
GitLab