Module Name: src
Committed By: martin
Date: Tue Dec 26 12:43:59 UTC 2017
Modified Files:
src/sys/modules/lua: lua.c
Log Message:
Fix cargo cult ioctl implementation for LUAINFO: the name and desc fields
are arrays, not pointers, so don't use copyoutstr on them, but instead
copyin/copyout the whole array of structures.
Fixes PR 52864 for me (on sparc64).
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/modules/lua/lua.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/lua/lua.c
diff -u src/sys/modules/lua/lua.c:1.23 src/sys/modules/lua/lua.c:1.24
--- src/sys/modules/lua/lua.c:1.23 Sat May 20 09:46:17 2017
+++ src/sys/modules/lua/lua.c Tue Dec 26 12:43:59 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: lua.c,v 1.23 2017/05/20 09:46:17 mbalmer Exp $ */
+/* $NetBSD: lua.c,v 1.24 2017/12/26 12:43:59 martin Exp $ */
/*
* Copyright (c) 2011 - 2017 by Marc Balmer <mbal...@netbsd.org>.
@@ -288,6 +288,7 @@ luaioctl(dev_t dev, u_long cmd, void *da
struct pathbuf *pb;
struct vattr va;
struct lua_loadstate ls;
+ struct lua_state_info *states;
int error, n;
klua_State *K;
@@ -307,14 +308,25 @@ luaioctl(dev_t dev, u_long cmd, void *da
LIST_FOREACH(s, &lua_states, lua_next) {
if (n > info->num_states)
break;
- copyoutstr(s->lua_name, info->states[n].name,
- MAX_LUA_NAME, NULL);
- copyoutstr(s->lua_desc, info->states[n].desc,
- MAX_LUA_DESC, NULL);
- info->states[n].user = s->K->ks_user;
n++;
}
info->num_states = n;
+ states = kmem_alloc(sizeof(*states) * n, KM_SLEEP);
+ if (copyin(info->states, states, sizeof(*states) * n)
+ == 0) {
+ n = 0;
+ LIST_FOREACH(s, &lua_states, lua_next) {
+ if (n > info->num_states)
+ break;
+ strcpy(states[n].name, s->lua_name);
+ strcpy(states[n].desc, s->lua_desc);
+ states[n].user = s->K->ks_user;
+ n++;
+ }
+ copyout(states, info->states,
+ sizeof(*states) * n);
+ kmem_free(states, sizeof(*states) * n);
+ }
}
break;
case LUACREATE:
