[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <484FA0B8.2000002@openvz.org>
Date: Wed, 11 Jun 2008 13:54:00 +0400
From: Pavel Emelyanov <xemul@...nvz.org>
To: Ian Kent <raven@...maw.net>
CC: autofs mailing list <autofs@...ux.kernel.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Konstantin Khlebnikov <khlebnikov@...nvz.org>
Subject: [PATCH] autofs4: fix 32-bit userspace vs 64-bit kernel communications
From: Konstantin Khlebnikov <khlebnikov@...nvz.org>
The struct autofs_v5_packet has only one difference between
32-bit and 64-bit versions - on 64-bit gcc aligns its size and
it is 4 bytes larger that it is on 32-bit kernel. This confuses
32-bit user-space daemon, when talking to 64-bit kernel.
This is very critical for containerized setups, when containers
with <different>-bit tolls are used.
Signed-off-by: Konstantin Khlebnikov <khlebnikov@...nvz.org>
Acked-by: Pavel Emelyanov <xemul@...nvz.org>
---
diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
index 1e4a539..9855b6e 100644
--- a/fs/autofs4/waitq.c
+++ b/fs/autofs4/waitq.c
@@ -132,6 +132,14 @@ static void autofs4_notify_daemon(struct autofs_sb_info *sbi,
struct autofs_v5_packet *packet = &pkt.v5_pkt.v5_packet;
pktsz = sizeof(*packet);
+#if defined(CONFIG_X86_64) && defined(CONFIG_IA32_EMULATION)
+ /*
+ * On x86_64 autofs_v5_packet struct is padded with 4 bytes
+ * which breaks 32-bit autofs daemon.
+ */
+ if (test_thread_flag(TIF_IA32))
+ pktsz -= 4;
+#endif
packet->wait_queue_token = wq->wait_queue_token;
packet->len = wq->len;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists