use syscall_arg_t and __scc macro for arguments to __alt_socketcall

[musl] / src / misc / ioctl.c

diff --git a/src/misc/ioctl.c b/src/misc/ioctl.c
index 245876e..35804f0 100644 (file)
--- a/src/misc/ioctl.c
+++ b/src/misc/ioctl.c
@@ -4,7 +4,9 @@
 #include <time.h>
 #include <sys/time.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <string.h>
+#include <endian.h>
 #include "syscall.h"
 
 #define alignof(t) offsetof(struct { char c; t x; }, x)
@@ -23,9 +25,59 @@ struct ioctl_compat_map {
 #define COUNT(...) NINTH(__VA_ARGS__,8,7,6,5,4,3,2,1,0)
 #define OFFS(...) COUNT(__VA_ARGS__), { __VA_ARGS__ }
 
+/* yields a type for a struct with original size n, with a misaligned
+ * timeval/timespec expanded from 32- to 64-bit. for use with ioctl
+ * number producing macros; only size of result is meaningful. */
+#define new_misaligned(n) struct { int i; time_t t; char c[(n)-4]; }
+
+struct v4l2_event {
+       uint32_t a;
+       uint64_t b[8];
+       uint32_t c[2], ts[2], d[9];
+};
+
 static const struct ioctl_compat_map compat_map[] = {
        { SIOCGSTAMP, SIOCGSTAMP_OLD, 8, R, 0, OFFS(0, 4) },
        { SIOCGSTAMPNS, SIOCGSTAMPNS_OLD, 8, R, 0, OFFS(0, 4) },
+
+       /* SNDRV_TIMER_IOCTL_STATUS */
+       { _IOR('T', 0x14, char[96]), _IOR('T', 0x14, 88), 88, R, 0, OFFS(0,4) },
+
+       /* SNDRV_PCM_IOCTL_STATUS[_EXT] */
+       { _IOR('A', 0x20, char[128]), _IOR('A', 0x20, char[108]), 108, R, 1, OFFS(4,8,12,16,52,56,60,64) },
+       { _IOWR('A', 0x24, char[128]), _IOWR('A', 0x24, char[108]), 108, WR, 1, OFFS(4,8,12,16,52,56,60,64) },
+
+       /* SNDRV_RAWMIDI_IOCTL_STATUS */
+       { _IOWR('W', 0x20, char[48]), _IOWR('W', 0x20, char[36]), 36, WR, 1, OFFS(4,8) },
+
+       /* SNDRV_PCM_IOCTL_SYNC_PTR - with 3 subtables */
+       { _IOWR('A', 0x23, char[136]), _IOWR('A', 0x23, char[132]), 0, WR, 1, 0 },
+       { 0, 0, 4, WR, 1, 0 }, /* snd_pcm_sync_ptr (flags only) */
+       { 0, 0, 32, WR, 1, OFFS(8,12,16,24,28) }, /* snd_pcm_mmap_status */
+       { 0, 0, 4, WR, 1, 0 }, /* snd_pcm_mmap_control (each member) */
+
+       /* VIDIOC_QUERYBUF, VIDIOC_QBUF, VIDIOC_DQBUF, VIDIOC_PREPARE_BUF */
+       { _IOWR('V',  9, new_misaligned(68)), _IOWR('V',  9, char[68]), 68, WR, 1, OFFS(20, 24) },
+       { _IOWR('V', 15, new_misaligned(68)), _IOWR('V', 15, char[68]), 68, WR, 1, OFFS(20, 24) },
+       { _IOWR('V', 17, new_misaligned(68)), _IOWR('V', 17, char[68]), 68, WR, 1, OFFS(20, 24) },
+       { _IOWR('V', 93, new_misaligned(68)), _IOWR('V', 93, char[68]), 68, WR, 1, OFFS(20, 24) },
+
+       /* VIDIOC_DQEVENT */
+       { _IOR('V', 89, new_misaligned(120)), _IOR('V', 89, struct v4l2_event), sizeof(struct v4l2_event),
+         R, 0, OFFS(offsetof(struct v4l2_event, ts[0]), offsetof(struct v4l2_event, ts[1])) },
+
+       /* VIDIOC_OMAP3ISP_STAT_REQ */
+       { _IOWR('V', 192+6, char[32]), _IOWR('V', 192+6, char[24]), 22, WR, 0, OFFS(0,4) },
+
+       /* PPPIOCGIDLE */
+       { _IOR('t', 63, char[16]), _IOR('t', 63, char[8]), 8, R, 0, OFFS(0,4) },
+
+       /* PPGETTIME, PPSETTIME */
+       { _IOR('p', 0x95, char[16]), _IOR('p', 0x95, char[8]), 8, R, 0, OFFS(0,4) },
+       { _IOW('p', 0x96, char[16]), _IOW('p', 0x96, char[8]), 8, W, 0, OFFS(0,4) },
+
+       /* LPSETTIMEOUT */
+       { _IOW(0x6, 0xf, char[16]), 0x060f, 8, W, 0, OFFS(0,4) },
 };
 
 static void convert_ioctl_struct(const struct ioctl_compat_map *map, char *old, char *new, int dir)
@@ -34,6 +86,18 @@ static void convert_ioctl_struct(const struct ioctl_compat_map *map, char *old,
        int old_offset = 0;
        int old_size = map->old_size;
        if (!(dir & map->dir)) return;
+       if (!map->old_size) {
+               /* offsets hard-coded for SNDRV_PCM_IOCTL_SYNC_PTR;
+                * if another exception appears this needs changing. */
+               convert_ioctl_struct(map+1, old, new, dir);
+               convert_ioctl_struct(map+2, old+4, new+8, dir);
+               /* snd_pcm_mmap_control, special-cased due to kernel
+                * type definition having been botched. */
+               int adj = BYTE_ORDER==BIG_ENDIAN ? 4 : 0;
+               convert_ioctl_struct(map+3, old+68, new+72+adj, dir);
+               convert_ioctl_struct(map+3, old+72, new+76+3*adj, dir);
+               return;
+       }
        for (int i=0; i < map->noffs; i++) {
                int ts_offset = map->offsets[i];
                int len = ts_offset-old_offset;
@@ -69,7 +133,7 @@ int ioctl(int fd, int req, ...)
        arg = va_arg(ap, void *);
        va_end(ap);
        int r = __syscall(SYS_ioctl, fd, req, arg);
-       if (r==-ENOTTY) {
+       if (SIOCGSTAMP != SIOCGSTAMP_OLD && req && r==-ENOTTY) {
                for (int i=0; i<sizeof compat_map/sizeof *compat_map; i++) {
                        if (compat_map[i].new_req != req) continue;
                        union {
@@ -80,6 +144,7 @@ int ioctl(int fd, int req, ...)
                        r = __syscall(SYS_ioctl, fd, compat_map[i].old_req, u.buf);
                        if (r<0) break;
                        convert_ioctl_struct(&compat_map[i], u.buf, arg, R);
+                       break;
                }
        }
        return __syscall_ret(r);