diff mbox

fs/compat: fix a bug in do_ncp_super_data_conv()

Message ID 20160204114009.GB11239@mwanda (mailing list archive)
State New, archived
Headers show

Commit Message

Dan Carpenter Feb. 4, 2016, 11:40 a.m. UTC 
We are trying to copy the c_n->mounted_vol[] array and the three integer
struct members that follow it.  The problem is that there is a 3 byte
struct hole after c_n->mounted_vol[] so we don't copy the lower 3 bytes
of c_n->flags.

I fixed it by doing the assignments one at a time.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/fs/compat.c b/fs/compat.c
index a71936a..355ab04 100644
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -693,7 +693,11 @@  static void *do_ncp_super_data_conv(void *raw_data)
 		n->file_mode = c_n->file_mode;
 		n->gid = c_n->gid;
 		n->uid = c_n->uid;
-		memmove (n->mounted_vol, c_n->mounted_vol, (sizeof (c_n->mounted_vol) + 3 * sizeof (unsigned int)));
+		memmove(n->mounted_vol, c_n->mounted_vol,
+			sizeof(c_n->mounted_vol));
+		n->time_out = c_n->time_out;
+		n->retry_count = c_n->retry_count;
+		n->flags = c_n->flags;
 		n->wdog_pid = c_n->wdog_pid;
 		n->mounted_uid = c_n->mounted_uid;
 	} else if (version == 4) {