autofs: work around unhappy compat problem on x86-64 (a32744d4) · Commits · 戴 / test

When the autofs protocol version 5 packet type was added in commit ("autofs4: add new packet type for v5 communications"), it obvously tried quite hard to be word-size agnostic, and uses explicitly sized fields that are all correctly aligned. However, with the final "char name[NAME_MAX+1]" array at the end, the actual size of the structure ends up being not very well defined: because the struct isn't marked 'packed', doing a "sizeof()" on it will align the size of the struct up to the biggest alignment of the members it has. And despite all the members being the same, the alignment of them is different: a "__u64" has 4-byte alignment on x86-32, but native 8-byte alignment on x86-64. And while 'NAME_MAX+1' ends up being a nice round number (256), the name[] array starts out a 4-byte aligned. End result: the "packed" size of the structure is 300 bytes: 4-byte, but not 8-byte aligned. As a result, despite all the fields being in the same place on all architectures, sizeof() will round up that size to 304 bytes on architectures that have 8-byte alignment for u64. Note that this is *not* a problem for 32-bit compat mode on POWER, since there __u64 is 8-byte aligned even in 32-bit mode. But on x86, 32-bit and 64-bit alignment is different for 64-bit entities, and as a result the structure that has exactly the same layout has different sizes. So on x86-64, but no other architecture, we will just subtract 4 from the size of the structure when running in a compat task. That way we will write the properly sized packet that user mode expects. Not pretty. Sadly, this very subtle, and unnecessary, size difference has been encoded in user space that wants to read packets of *exactly* the right size, and will refuse to touch anything else. Reported-and-tested-by:

Thomas Meyer <thomas@m3y3r.de> Signed-off-by:

Ian Kent <raven@themaw.net> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

fs/autofs4/autofs_i.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -110,6 +110,7 @@ struct autofs_sb_info {
		int sub_version;
		int min_proto;
		int max_proto;
		int compat_daemon;
		unsigned long exp_timeout;
		unsigned int type;
		int reghost_enabled;

fs/autofs4/dev-ioctl.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -385,6 +385,7 @@ static int autofs_dev_ioctl_setpipefd(struct file *fp,
		sbi->pipefd = pipefd;
		sbi->pipe = pipe;
		sbi->catatonic = 0;
		sbi->compat_daemon = is_compat_task();
		}
		out:
		mutex_unlock(&sbi->wq_mutex);

fs/autofs4/inode.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@
		#include <linux/parser.h>
		#include <linux/bitops.h>
		#include <linux/magic.h>
		#include <linux/compat.h>
		#include "autofs_i.h"
		#include <linux/module.h>

		@@ -224,6 +225,7 @@ int autofs4_fill_super(struct super_block s, void data, int silent)
		set_autofs_type_indirect(&sbi->type);
		sbi->min_proto = 0;
		sbi->max_proto = 0;
		sbi->compat_daemon = is_compat_task();
		mutex_init(&sbi->wq_mutex);
		mutex_init(&sbi->pipe_mutex);
		spin_lock_init(&sbi->fs_lock);

fs/autofs4/waitq.c

+19 −3

Original line number	Diff line number	Diff line
		@@ -92,6 +92,23 @@ static int autofs4_write(struct autofs_sb_info *sbi,
		return (bytes > 0);
		}

		/*
		* The autofs_v5 packet was misdesigned.
		*
		* The packets are identical on x86-32 and x86-64, but have different
		* alignment. Which means that 'sizeof()' will give different results.
		* Fix it up for the case of running 32-bit user mode on a 64-bit kernel.
		*/
		static noinline size_t autofs_v5_packet_size(struct autofs_sb_info *sbi)
		{
		size_t pktsz = sizeof(struct autofs_v5_packet);
		#if defined(CONFIG_X86_64) && defined(CONFIG_COMPAT)
		if (sbi->compat_daemon > 0)
		pktsz -= 4;
		#endif
		return pktsz;
		}

		static void autofs4_notify_daemon(struct autofs_sb_info *sbi,
		struct autofs_wait_queue *wq,
		int type)
		@@ -155,8 +172,7 @@ static void autofs4_notify_daemon(struct autofs_sb_info *sbi,
		{
		struct autofs_v5_packet *packet = &pkt.v5_pkt.v5_packet;

		pktsz = sizeof(*packet);

		pktsz = autofs_v5_packet_size(sbi);
		packet->wait_queue_token = wq->wait_queue_token;
		packet->len = wq->name.len;
		memcpy(packet->name, wq->name.name, wq->name.len);

Admin message