UPSTREAM: selftests: timers: Fix valid-adjtimex signed left-shift undefined behavior
[ Upstream commit 076361362122a6d8a4c45f172ced5576b2d4a50d ] The struct adjtimex freq field takes a signed value who's units are in shifted (<<16) parts-per-million. Unfortunately for negative adjustments, the straightforward use of: freq = ppm << 16 trips undefined behavior warnings with clang: valid-adjtimex.c:66:6: warning: shifting a negative signed value is undefined [-Wshift-negative-value] -499<<16, ~~~~^ valid-adjtimex.c:67:6: warning: shifting a negative signed value is undefined [-Wshift-negative-value] -450<<16, ~~~~^ .. Fix it by using a multiply by (1 << 16) instead of shifting negative values in the valid-adjtimex test case. Align the values for better readability. Bug: 339526723 Reported-by: Lee Jones <joneslee@google.com> Reported-by: Muhammad Usama Anjum <usama.anjum@collabora.com> Change-Id: Ied611c13a802acf9c7a2427f0a61eb358b571a3d Signed-off-by: John Stultz <jstultz@google.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Muhammad Usama Anjum <usama.anjum@collabora.com> Link: https://lore.kernel.org/r/20240409202222.2830476-1-jstultz@google.com Link: https://lore.kernel.org/lkml/0c6d4f0d-2064-4444-986b-1d1ed782135f@collabora.com/ Signed-off-by: Sasha Levin <sashal@kernel.org> (cherry picked from commit 1f3484dec916a3c4f43c4c44bad398bc24373110) Signed-off-by: Edward Liaw <edliaw@google.com>
This commit is contained in:
@@ -21,9 +21,6 @@
|
|||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
@@ -62,45 +59,47 @@ int clear_time_state(void)
|
|||||||
#define NUM_FREQ_OUTOFRANGE 4
|
#define NUM_FREQ_OUTOFRANGE 4
|
||||||
#define NUM_FREQ_INVALID 2
|
#define NUM_FREQ_INVALID 2
|
||||||
|
|
||||||
|
#define SHIFTED_PPM (1 << 16)
|
||||||
|
|
||||||
long valid_freq[NUM_FREQ_VALID] = {
|
long valid_freq[NUM_FREQ_VALID] = {
|
||||||
-499<<16,
|
-499 * SHIFTED_PPM,
|
||||||
-450<<16,
|
-450 * SHIFTED_PPM,
|
||||||
-400<<16,
|
-400 * SHIFTED_PPM,
|
||||||
-350<<16,
|
-350 * SHIFTED_PPM,
|
||||||
-300<<16,
|
-300 * SHIFTED_PPM,
|
||||||
-250<<16,
|
-250 * SHIFTED_PPM,
|
||||||
-200<<16,
|
-200 * SHIFTED_PPM,
|
||||||
-150<<16,
|
-150 * SHIFTED_PPM,
|
||||||
-100<<16,
|
-100 * SHIFTED_PPM,
|
||||||
-75<<16,
|
-75 * SHIFTED_PPM,
|
||||||
-50<<16,
|
-50 * SHIFTED_PPM,
|
||||||
-25<<16,
|
-25 * SHIFTED_PPM,
|
||||||
-10<<16,
|
-10 * SHIFTED_PPM,
|
||||||
-5<<16,
|
-5 * SHIFTED_PPM,
|
||||||
-1<<16,
|
-1 * SHIFTED_PPM,
|
||||||
-1000,
|
-1000,
|
||||||
1<<16,
|
1 * SHIFTED_PPM,
|
||||||
5<<16,
|
5 * SHIFTED_PPM,
|
||||||
10<<16,
|
10 * SHIFTED_PPM,
|
||||||
25<<16,
|
25 * SHIFTED_PPM,
|
||||||
50<<16,
|
50 * SHIFTED_PPM,
|
||||||
75<<16,
|
75 * SHIFTED_PPM,
|
||||||
100<<16,
|
100 * SHIFTED_PPM,
|
||||||
150<<16,
|
150 * SHIFTED_PPM,
|
||||||
200<<16,
|
200 * SHIFTED_PPM,
|
||||||
250<<16,
|
250 * SHIFTED_PPM,
|
||||||
300<<16,
|
300 * SHIFTED_PPM,
|
||||||
350<<16,
|
350 * SHIFTED_PPM,
|
||||||
400<<16,
|
400 * SHIFTED_PPM,
|
||||||
450<<16,
|
450 * SHIFTED_PPM,
|
||||||
499<<16,
|
499 * SHIFTED_PPM,
|
||||||
};
|
};
|
||||||
|
|
||||||
long outofrange_freq[NUM_FREQ_OUTOFRANGE] = {
|
long outofrange_freq[NUM_FREQ_OUTOFRANGE] = {
|
||||||
-1000<<16,
|
-1000 * SHIFTED_PPM,
|
||||||
-550<<16,
|
-550 * SHIFTED_PPM,
|
||||||
550<<16,
|
550 * SHIFTED_PPM,
|
||||||
1000<<16,
|
1000 * SHIFTED_PPM,
|
||||||
};
|
};
|
||||||
|
|
||||||
#define LONG_MAX (~0UL>>1)
|
#define LONG_MAX (~0UL>>1)
|
||||||
|
Reference in New Issue
Block a user