path: root/net/econet
diff options
authorPetr Vandrovec <petr@vandrovec.name>2006-03-27 23:39:31 -0800
committerDavid S. Miller <davem@sunset.davemloft.net>2006-03-28 17:02:43 -0800
commitf6c90b71a355a0a4a22e1cfee5748617adc25a53 (patch)
tree2fdbe51a57e25a781128ce4a8c85375201221ded /net/econet
parentf1465f7ea9e7aecba8e41d4aac9240f9b7fe2e24 (diff)
[NET]: Fix ipx/econet/appletalk/irda ioctl crashes
Fix kernel oopses whenever somebody issues compatible ioctl on AppleTalk, Econet, IPX or IRDA socket. For AppleTalk/Econet/IRDA it restores state in which these sockets were before compat_ioctl was introduced to the socket ops, for IPX it implements support for 4 ioctls which were not implemented before - as these ioctls use structures which match between 32bit and 64bit userspace, no special code is needed, just call 64bit ioctl handler. Signed-off-by: Petr Vandrovec <petr@vandrovec.name> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/econet')
1 files changed, 16 insertions, 0 deletions
diff --git a/net/econet/af_econet.c b/net/econet/af_econet.c
index c792994d7952..0c4c83bb2a59 100644
--- a/net/econet/af_econet.c
+++ b/net/econet/af_econet.c
@@ -693,6 +693,19 @@ static int econet_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg
return 0;
+static int econet_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
+ /*
+ * All ioctls provided by econet are standard. There is one gotcha, sockaddr_ec
+ * differs between 32bit and 64bit. Fortunately nobody in kernel uses portion
+ * of sockaddr which differs between 32bit and 64bit, so we do not need special
+ * handling.
+ */
+ return -ENOIOCTLCMD;
static struct net_proto_family econet_family_ops = {
.family = PF_ECONET,
.create = econet_create,
@@ -710,6 +723,9 @@ static const struct proto_ops SOCKOPS_WRAPPED(econet_ops) = {
.getname = econet_getname,
.poll = datagram_poll,
.ioctl = econet_ioctl,
+ .compat_ioctl = econet_compat_ioctl,
.listen = sock_no_listen,
.shutdown = sock_no_shutdown,
.setsockopt = sock_no_setsockopt,

Privacy Policy