summaryrefslogtreecommitdiff
path: root/sys/compat
diff options
context:
space:
mode:
authorjdolecek <jdolecek@NetBSD.org>2020-06-24 17:47:52 +0000
committerjdolecek <jdolecek@NetBSD.org>2020-06-24 17:47:52 +0000
commitf3415143db2b2ed7767b2dc4e81ea46ead80f22f (patch)
tree8e184a379887d4e172cbb35cea0a0acaf78e56be /sys/compat
parente4f2dbfacd6ef1b5322af5396742938a13f6d150 (diff)
reduce stack usage in compat_60_ptmget_ioctl() - allocate struct ptmget
via kmem_alloc()
Diffstat (limited to 'sys/compat')
-rw-r--r--sys/compat/common/tty_60.c19
1 files changed, 13 insertions, 6 deletions
diff --git a/sys/compat/common/tty_60.c b/sys/compat/common/tty_60.c
index 426699ed0a6..972a34d623b 100644
--- a/sys/compat/common/tty_60.c
+++ b/sys/compat/common/tty_60.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tty_60.c,v 1.9 2019/12/12 02:15:42 pgoyette Exp $ */
+/* $NetBSD: tty_60.c,v 1.10 2020/06/24 17:47:52 jdolecek Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tty_60.c,v 1.9 2019/12/12 02:15:42 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty_60.c,v 1.10 2020/06/24 17:47:52 jdolecek Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -42,6 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: tty_60.c,v 1.9 2019/12/12 02:15:42 pgoyette Exp $");
#include <sys/errno.h>
#include <sys/systm.h>
#include <sys/compat_stub.h>
+#include <sys/kmem.h>
#include <sys/tty.h>
@@ -70,7 +71,7 @@ compat_60_ptmget_ioctl(dev_t dev, u_long cmd, void *data, int flag,
{
int ret;
u_long newcmd;
- struct ptmget pg;
+ struct ptmget *pg;
const struct cdevsw *cd = cdevsw_lookup(dev);
if (cd == NULL || cd->d_ioctl == NULL)
@@ -82,10 +83,16 @@ compat_60_ptmget_ioctl(dev_t dev, u_long cmd, void *data, int flag,
default: return ENOTTY;
}
- ret = (cd->d_ioctl)(dev, newcmd, &pg, flag, l);
+ pg = kmem_alloc(sizeof(*pg), KM_SLEEP);
+
+ ret = (cd->d_ioctl)(dev, newcmd, pg, flag, l);
if (ret != 0)
- return ret;
- ret = ptmget_to_ptmget60(&pg, data);
+ goto out;
+
+ ret = ptmget_to_ptmget60(pg, data);
+
+out:
+ kmem_free(pg, sizeof(*pg));
return ret;
}