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
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
|
From fbb222c9bccb407750cea61e3bb6285cb8c1b330 Mon Sep 17 00:00:00 2001
From: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Date: Sun, 28 Jul 2019 13:48:50 +0900
Subject: [PATCH] axfer: test: fix invalid comparison of 64 bit storage in
ILP32 data type
In system V ABIs with ILP32 data model, bit shift for '1ul' can brings
undefined behaviour when the calculation result is over 32 bit width.
This commit fixes the bug.
Reported-by: Rolf Eike Beer <eike@sf-mail.de>
Reference: https://bugs.gentoo.org/681652
Reference: https://github.com/alsa-project/alsa-utils/issues/23
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
axfer/test/container-test.c | 142 ++++++++++++++++++------------------
axfer/test/generator.c | 4 +-
axfer/test/mapper-test.c | 24 +++---
3 files changed, 85 insertions(+), 85 deletions(-)
diff --git a/axfer/test/container-test.c b/axfer/test/container-test.c
index 0e2e6e9..9b30ae3 100644
--- a/axfer/test/container-test.c
+++ b/axfer/test/container-test.c
@@ -172,82 +172,82 @@ int main(int argc, const char *argv[])
{
static const uint64_t sample_format_masks[] = {
[CONTAINER_FORMAT_RIFF_WAVE] =
- (1ul << SND_PCM_FORMAT_U8) |
- (1ul << SND_PCM_FORMAT_S16_LE) |
- (1ul << SND_PCM_FORMAT_S16_BE) |
- (1ul << SND_PCM_FORMAT_S24_LE) |
- (1ul << SND_PCM_FORMAT_S24_BE) |
- (1ul << SND_PCM_FORMAT_S32_LE) |
- (1ul << SND_PCM_FORMAT_S32_BE) |
- (1ul << SND_PCM_FORMAT_FLOAT_LE) |
- (1ul << SND_PCM_FORMAT_FLOAT_BE) |
- (1ul << SND_PCM_FORMAT_FLOAT64_LE) |
- (1ul << SND_PCM_FORMAT_FLOAT64_BE) |
- (1ul << SND_PCM_FORMAT_MU_LAW) |
- (1ul << SND_PCM_FORMAT_A_LAW) |
- (1ul << SND_PCM_FORMAT_S24_3LE) |
- (1ul << SND_PCM_FORMAT_S24_3BE) |
- (1ul << SND_PCM_FORMAT_S20_3LE) |
- (1ul << SND_PCM_FORMAT_S20_3BE) |
- (1ul << SND_PCM_FORMAT_S18_3LE) |
- (1ul << SND_PCM_FORMAT_S18_3BE),
+ (1ull << SND_PCM_FORMAT_U8) |
+ (1ull << SND_PCM_FORMAT_S16_LE) |
+ (1ull << SND_PCM_FORMAT_S16_BE) |
+ (1ull << SND_PCM_FORMAT_S24_LE) |
+ (1ull << SND_PCM_FORMAT_S24_BE) |
+ (1ull << SND_PCM_FORMAT_S32_LE) |
+ (1ull << SND_PCM_FORMAT_S32_BE) |
+ (1ull << SND_PCM_FORMAT_FLOAT_LE) |
+ (1ull << SND_PCM_FORMAT_FLOAT_BE) |
+ (1ull << SND_PCM_FORMAT_FLOAT64_LE) |
+ (1ull << SND_PCM_FORMAT_FLOAT64_BE) |
+ (1ull << SND_PCM_FORMAT_MU_LAW) |
+ (1ull << SND_PCM_FORMAT_A_LAW) |
+ (1ull << SND_PCM_FORMAT_S24_3LE) |
+ (1ull << SND_PCM_FORMAT_S24_3BE) |
+ (1ull << SND_PCM_FORMAT_S20_3LE) |
+ (1ull << SND_PCM_FORMAT_S20_3BE) |
+ (1ull << SND_PCM_FORMAT_S18_3LE) |
+ (1ull << SND_PCM_FORMAT_S18_3BE),
[CONTAINER_FORMAT_AU] =
- (1ul << SND_PCM_FORMAT_S8) |
- (1ul << SND_PCM_FORMAT_S16_BE) |
- (1ul << SND_PCM_FORMAT_S32_BE) |
- (1ul << SND_PCM_FORMAT_FLOAT_BE) |
- (1ul << SND_PCM_FORMAT_FLOAT64_BE) |
- (1ul << SND_PCM_FORMAT_MU_LAW) |
- (1ul << SND_PCM_FORMAT_A_LAW),
+ (1ull << SND_PCM_FORMAT_S8) |
+ (1ull << SND_PCM_FORMAT_S16_BE) |
+ (1ull << SND_PCM_FORMAT_S32_BE) |
+ (1ull << SND_PCM_FORMAT_FLOAT_BE) |
+ (1ull << SND_PCM_FORMAT_FLOAT64_BE) |
+ (1ull << SND_PCM_FORMAT_MU_LAW) |
+ (1ull << SND_PCM_FORMAT_A_LAW),
[CONTAINER_FORMAT_VOC] =
- (1ul << SND_PCM_FORMAT_U8) |
- (1ul << SND_PCM_FORMAT_S16_LE) |
- (1ul << SND_PCM_FORMAT_MU_LAW) |
- (1ul << SND_PCM_FORMAT_A_LAW),
+ (1ull << SND_PCM_FORMAT_U8) |
+ (1ull << SND_PCM_FORMAT_S16_LE) |
+ (1ull << SND_PCM_FORMAT_MU_LAW) |
+ (1ull << SND_PCM_FORMAT_A_LAW),
[CONTAINER_FORMAT_RAW] =
- (1ul << SND_PCM_FORMAT_S8) |
- (1ul << SND_PCM_FORMAT_U8) |
- (1ul << SND_PCM_FORMAT_S16_LE) |
- (1ul << SND_PCM_FORMAT_S16_BE) |
- (1ul << SND_PCM_FORMAT_U16_LE) |
- (1ul << SND_PCM_FORMAT_U16_BE) |
- (1ul << SND_PCM_FORMAT_S24_LE) |
- (1ul << SND_PCM_FORMAT_S24_BE) |
- (1ul << SND_PCM_FORMAT_U24_LE) |
- (1ul << SND_PCM_FORMAT_U24_BE) |
- (1ul << SND_PCM_FORMAT_S32_LE) |
- (1ul << SND_PCM_FORMAT_S32_BE) |
- (1ul << SND_PCM_FORMAT_U32_LE) |
- (1ul << SND_PCM_FORMAT_U32_BE) |
- (1ul << SND_PCM_FORMAT_FLOAT_LE) |
- (1ul << SND_PCM_FORMAT_FLOAT_BE) |
- (1ul << SND_PCM_FORMAT_FLOAT64_LE) |
- (1ul << SND_PCM_FORMAT_FLOAT64_BE) |
- (1ul << SND_PCM_FORMAT_IEC958_SUBFRAME_LE) |
- (1ul << SND_PCM_FORMAT_IEC958_SUBFRAME_BE) |
- (1ul << SND_PCM_FORMAT_MU_LAW) |
- (1ul << SND_PCM_FORMAT_A_LAW) |
- (1ul << SND_PCM_FORMAT_S24_3LE) |
- (1ul << SND_PCM_FORMAT_S24_3BE) |
- (1ul << SND_PCM_FORMAT_U24_3LE) |
- (1ul << SND_PCM_FORMAT_U24_3BE) |
- (1ul << SND_PCM_FORMAT_S20_3LE) |
- (1ul << SND_PCM_FORMAT_S20_3BE) |
- (1ul << SND_PCM_FORMAT_U20_3LE) |
- (1ul << SND_PCM_FORMAT_U20_3BE) |
- (1ul << SND_PCM_FORMAT_S18_3LE) |
- (1ul << SND_PCM_FORMAT_S18_3BE) |
- (1ul << SND_PCM_FORMAT_U18_3LE) |
- (1ul << SND_PCM_FORMAT_U18_3BE) |
- (1ul << SND_PCM_FORMAT_DSD_U8) |
- (1ul << SND_PCM_FORMAT_DSD_U16_LE) |
- (1ul << SND_PCM_FORMAT_DSD_U32_LE) |
- (1ul << SND_PCM_FORMAT_DSD_U16_BE) |
- (1ul << SND_PCM_FORMAT_DSD_U32_BE),
+ (1ull << SND_PCM_FORMAT_S8) |
+ (1ull << SND_PCM_FORMAT_U8) |
+ (1ull << SND_PCM_FORMAT_S16_LE) |
+ (1ull << SND_PCM_FORMAT_S16_BE) |
+ (1ull << SND_PCM_FORMAT_U16_LE) |
+ (1ull << SND_PCM_FORMAT_U16_BE) |
+ (1ull << SND_PCM_FORMAT_S24_LE) |
+ (1ull << SND_PCM_FORMAT_S24_BE) |
+ (1ull << SND_PCM_FORMAT_U24_LE) |
+ (1ull << SND_PCM_FORMAT_U24_BE) |
+ (1ull << SND_PCM_FORMAT_S32_LE) |
+ (1ull << SND_PCM_FORMAT_S32_BE) |
+ (1ull << SND_PCM_FORMAT_U32_LE) |
+ (1ull << SND_PCM_FORMAT_U32_BE) |
+ (1ull << SND_PCM_FORMAT_FLOAT_LE) |
+ (1ull << SND_PCM_FORMAT_FLOAT_BE) |
+ (1ull << SND_PCM_FORMAT_FLOAT64_LE) |
+ (1ull << SND_PCM_FORMAT_FLOAT64_BE) |
+ (1ull << SND_PCM_FORMAT_IEC958_SUBFRAME_LE) |
+ (1ull << SND_PCM_FORMAT_IEC958_SUBFRAME_BE) |
+ (1ull << SND_PCM_FORMAT_MU_LAW) |
+ (1ull << SND_PCM_FORMAT_A_LAW) |
+ (1ull << SND_PCM_FORMAT_S24_3LE) |
+ (1ull << SND_PCM_FORMAT_S24_3BE) |
+ (1ull << SND_PCM_FORMAT_U24_3LE) |
+ (1ull << SND_PCM_FORMAT_U24_3BE) |
+ (1ull << SND_PCM_FORMAT_S20_3LE) |
+ (1ull << SND_PCM_FORMAT_S20_3BE) |
+ (1ull << SND_PCM_FORMAT_U20_3LE) |
+ (1ull << SND_PCM_FORMAT_U20_3BE) |
+ (1ull << SND_PCM_FORMAT_S18_3LE) |
+ (1ull << SND_PCM_FORMAT_S18_3BE) |
+ (1ull << SND_PCM_FORMAT_U18_3LE) |
+ (1ull << SND_PCM_FORMAT_U18_3BE) |
+ (1ull << SND_PCM_FORMAT_DSD_U8) |
+ (1ull << SND_PCM_FORMAT_DSD_U16_LE) |
+ (1ull << SND_PCM_FORMAT_DSD_U32_LE) |
+ (1ull << SND_PCM_FORMAT_DSD_U16_BE) |
+ (1ull << SND_PCM_FORMAT_DSD_U32_BE),
};
static const uint64_t access_mask =
- (1ul << SND_PCM_ACCESS_MMAP_INTERLEAVED) |
- (1ul << SND_PCM_ACCESS_RW_INTERLEAVED);
+ (1ull << SND_PCM_ACCESS_MMAP_INTERLEAVED) |
+ (1ull << SND_PCM_ACCESS_RW_INTERLEAVED);
struct test_generator gen = {0};
struct container_trial *trial;
int i;
diff --git a/axfer/test/generator.c b/axfer/test/generator.c
index cdea2c9..bde8c5f 100644
--- a/axfer/test/generator.c
+++ b/axfer/test/generator.c
@@ -220,7 +220,7 @@ static int test_sample_format(struct test_generator *gen,
int err = 0;
for (i = 0; i <= SND_PCM_FORMAT_LAST; ++i) {
- if (!((1ul << i) & gen->sample_format_mask))
+ if (!((1ull << i) & gen->sample_format_mask))
continue;
err = test_samples_per_frame(gen, access, i);
@@ -237,7 +237,7 @@ static int test_access(struct test_generator *gen)
int err = 0;
for (i = 0; i <= SND_PCM_ACCESS_LAST; ++i) {
- if (!((1ul << i) & gen->access_mask))
+ if (!((1ull << i) & gen->access_mask))
continue;
err = test_sample_format(gen, i);
diff --git a/axfer/test/mapper-test.c b/axfer/test/mapper-test.c
index 6b24d54..f0376c7 100644
--- a/axfer/test/mapper-test.c
+++ b/axfer/test/mapper-test.c
@@ -396,13 +396,13 @@ int main(int argc, const char *argv[])
{
// Test 8/16/18/20/24/32/64 bytes per sample.
static const uint64_t sample_format_mask =
- (1ul << SND_PCM_FORMAT_U8) |
- (1ul << SND_PCM_FORMAT_S16_LE) |
- (1ul << SND_PCM_FORMAT_S18_3LE) |
- (1ul << SND_PCM_FORMAT_S20_3LE) |
- (1ul << SND_PCM_FORMAT_S24_LE) |
- (1ul << SND_PCM_FORMAT_S32_LE) |
- (1ul << SND_PCM_FORMAT_FLOAT64_LE);
+ (1ull << SND_PCM_FORMAT_U8) |
+ (1ull << SND_PCM_FORMAT_S16_LE) |
+ (1ull << SND_PCM_FORMAT_S18_3LE) |
+ (1ull << SND_PCM_FORMAT_S20_3LE) |
+ (1ull << SND_PCM_FORMAT_S24_LE) |
+ (1ull << SND_PCM_FORMAT_S32_LE) |
+ (1ull << SND_PCM_FORMAT_FLOAT64_LE);
uint64_t access_mask;
struct test_generator gen = {0};
struct mapper_trial *trial;
@@ -451,13 +451,13 @@ int main(int argc, const char *argv[])
goto end;
}
- access_mask = 1ul << access;
+ access_mask = 1ull << access;
verbose = true;
} else {
- access_mask = (1ul << SND_PCM_ACCESS_MMAP_INTERLEAVED) |
- (1ul << SND_PCM_ACCESS_MMAP_NONINTERLEAVED) |
- (1ul << SND_PCM_ACCESS_RW_INTERLEAVED) |
- (1ul << SND_PCM_ACCESS_RW_NONINTERLEAVED);
+ access_mask = (1ull << SND_PCM_ACCESS_MMAP_INTERLEAVED) |
+ (1ull << SND_PCM_ACCESS_MMAP_NONINTERLEAVED) |
+ (1ull << SND_PCM_ACCESS_RW_INTERLEAVED) |
+ (1ull << SND_PCM_ACCESS_RW_NONINTERLEAVED);
verbose = false;
}
--
2.21.0
|
GitWeb