blob: 1b6d56a8615556676c3a4b46aac3947c0b9a992e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
|
From 069cbc8a25155771af775ee084ba3519ed5a9602 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Mon, 30 Aug 2021 19:26:32 -0700
Subject: [PATCH] Prevent zero-length array members in asound.h
---
include/uapi/sound/asound.h | 31 +++++++++++++++++++++----------
1 file changed, 21 insertions(+), 10 deletions(-)
diff --git a/include/uapi/sound/asound.h b/include/uapi/sound/asound.h
index 628d46a0da92..23b0d301e83f 100644
--- a/include/uapi/sound/asound.h
+++ b/include/uapi/sound/asound.h
@@ -557,22 +557,30 @@ struct __snd_pcm_sync_ptr {
} c;
};
+#if __BITS_PER_LONG == 32
#if defined(__BYTE_ORDER) ? __BYTE_ORDER == __BIG_ENDIAN : defined(__BIG_ENDIAN)
-typedef char __pad_before_uframe[sizeof(__u64) - sizeof(snd_pcm_uframes_t)];
-typedef char __pad_after_uframe[0];
+#define __PAD_BEFORE_UFRAME(x) char x[sizeof(__u64) - sizeof(snd_pcm_uframes_t)];
#endif
#if defined(__BYTE_ORDER) ? __BYTE_ORDER == __LITTLE_ENDIAN : defined(__LITTLE_ENDIAN)
-typedef char __pad_before_uframe[0];
-typedef char __pad_after_uframe[sizeof(__u64) - sizeof(snd_pcm_uframes_t)];
+#define __PAD_AFTER_UFRAME(x) char x[sizeof(__u64) - sizeof(snd_pcm_uframes_t)];
+#endif
+#endif
+
+#ifndef __PAD_BEFORE_UFRAME
+#define __PAD_BEFORE_UFRAME(x)
+#endif
+
+#ifndef __PAD_AFTER_UFRAME
+#define __PAD_AFTER_UFRAME(x)
#endif
struct __snd_pcm_mmap_status64 {
snd_pcm_state_t state; /* RO: state - SNDRV_PCM_STATE_XXXX */
__u32 pad1; /* Needed for 64 bit alignment */
- __pad_before_uframe __pad1;
+ __PAD_BEFORE_UFRAME(__pad1)
snd_pcm_uframes_t hw_ptr; /* RO: hw ptr (0...boundary-1) */
- __pad_after_uframe __pad2;
+ __PAD_AFTER_UFRAME(__pad2)
struct __snd_timespec64 tstamp; /* Timestamp */
snd_pcm_state_t suspended_state;/* RO: suspended stream state */
__u32 pad3; /* Needed for 64 bit alignment */
@@ -580,16 +588,19 @@ struct __snd_pcm_mmap_status64 {
};
struct __snd_pcm_mmap_control64 {
- __pad_before_uframe __pad1;
+ __PAD_BEFORE_UFRAME(__pad1)
snd_pcm_uframes_t appl_ptr; /* RW: appl ptr (0...boundary-1) */
- __pad_before_uframe __pad2; // This should be __pad_after_uframe, but binary
+ __PAD_BEFORE_UFRAME(__pad2) // This should be __pad_after_uframe, but binary
// backwards compatibility constraints prevent a fix.
- __pad_before_uframe __pad3;
+ __PAD_BEFORE_UFRAME(__pad3)
snd_pcm_uframes_t avail_min; /* RW: min available frames for wakeup */
- __pad_after_uframe __pad4;
+ __PAD_AFTER_UFRAME(__pad4)
};
+#undef __PAD_BEFORE_UFRAME
+#undef __PAD_AFTER_UFRAME
+
struct __snd_pcm_sync_ptr64 {
__u32 flags;
__u32 pad1;
--
2.44.0
|
