diff options
-rw-r--r-- | lib/Kconfig | 2 | ||||
-rw-r--r-- | lib/Makefile | 1 | ||||
-rw-r--r-- | lib/string.c | 141 | ||||
-rw-r--r-- | lib/test_string.c | 141 |
4 files changed, 143 insertions, 142 deletions
diff --git a/lib/Kconfig b/lib/Kconfig index a2b6745324ab..368972f0db78 100644 --- a/lib/Kconfig +++ b/lib/Kconfig | |||
@@ -584,7 +584,7 @@ config PRIME_NUMBERS | |||
584 | tristate | 584 | tristate |
585 | 585 | ||
586 | config STRING_SELFTEST | 586 | config STRING_SELFTEST |
587 | bool "Test string functions" | 587 | tristate "Test string functions" |
588 | 588 | ||
589 | endmenu | 589 | endmenu |
590 | 590 | ||
diff --git a/lib/Makefile b/lib/Makefile index 136a0b254564..e3cb2a241338 100644 --- a/lib/Makefile +++ b/lib/Makefile | |||
@@ -40,6 +40,7 @@ obj-y += bcd.o div64.o sort.o parser.o debug_locks.o random32.o \ | |||
40 | bsearch.o find_bit.o llist.o memweight.o kfifo.o \ | 40 | bsearch.o find_bit.o llist.o memweight.o kfifo.o \ |
41 | percpu-refcount.o percpu_ida.o rhashtable.o reciprocal_div.o \ | 41 | percpu-refcount.o percpu_ida.o rhashtable.o reciprocal_div.o \ |
42 | once.o refcount.o usercopy.o errseq.o | 42 | once.o refcount.o usercopy.o errseq.o |
43 | obj-$(CONFIG_STRING_SELFTEST) += test_string.o | ||
43 | obj-y += string_helpers.o | 44 | obj-y += string_helpers.o |
44 | obj-$(CONFIG_TEST_STRING_HELPERS) += test-string_helpers.o | 45 | obj-$(CONFIG_TEST_STRING_HELPERS) += test-string_helpers.o |
45 | obj-y += hexdump.o | 46 | obj-y += hexdump.o |
diff --git a/lib/string.c b/lib/string.c index 5e8d410a93df..64a9e33f1daa 100644 --- a/lib/string.c +++ b/lib/string.c | |||
@@ -1052,144 +1052,3 @@ void fortify_panic(const char *name) | |||
1052 | BUG(); | 1052 | BUG(); |
1053 | } | 1053 | } |
1054 | EXPORT_SYMBOL(fortify_panic); | 1054 | EXPORT_SYMBOL(fortify_panic); |
1055 | |||
1056 | #ifdef CONFIG_STRING_SELFTEST | ||
1057 | #include <linux/slab.h> | ||
1058 | #include <linux/module.h> | ||
1059 | |||
1060 | static __init int memset16_selftest(void) | ||
1061 | { | ||
1062 | unsigned i, j, k; | ||
1063 | u16 v, *p; | ||
1064 | |||
1065 | p = kmalloc(256 * 2 * 2, GFP_KERNEL); | ||
1066 | if (!p) | ||
1067 | return -1; | ||
1068 | |||
1069 | for (i = 0; i < 256; i++) { | ||
1070 | for (j = 0; j < 256; j++) { | ||
1071 | memset(p, 0xa1, 256 * 2 * sizeof(v)); | ||
1072 | memset16(p + i, 0xb1b2, j); | ||
1073 | for (k = 0; k < 512; k++) { | ||
1074 | v = p[k]; | ||
1075 | if (k < i) { | ||
1076 | if (v != 0xa1a1) | ||
1077 | goto fail; | ||
1078 | } else if (k < i + j) { | ||
1079 | if (v != 0xb1b2) | ||
1080 | goto fail; | ||
1081 | } else { | ||
1082 | if (v != 0xa1a1) | ||
1083 | goto fail; | ||
1084 | } | ||
1085 | } | ||
1086 | } | ||
1087 | } | ||
1088 | |||
1089 | fail: | ||
1090 | kfree(p); | ||
1091 | if (i < 256) | ||
1092 | return (i << 24) | (j << 16) | k; | ||
1093 | return 0; | ||
1094 | } | ||
1095 | |||
1096 | static __init int memset32_selftest(void) | ||
1097 | { | ||
1098 | unsigned i, j, k; | ||
1099 | u32 v, *p; | ||
1100 | |||
1101 | p = kmalloc(256 * 2 * 4, GFP_KERNEL); | ||
1102 | if (!p) | ||
1103 | return -1; | ||
1104 | |||
1105 | for (i = 0; i < 256; i++) { | ||
1106 | for (j = 0; j < 256; j++) { | ||
1107 | memset(p, 0xa1, 256 * 2 * sizeof(v)); | ||
1108 | memset32(p + i, 0xb1b2b3b4, j); | ||
1109 | for (k = 0; k < 512; k++) { | ||
1110 | v = p[k]; | ||
1111 | if (k < i) { | ||
1112 | if (v != 0xa1a1a1a1) | ||
1113 | goto fail; | ||
1114 | } else if (k < i + j) { | ||
1115 | if (v != 0xb1b2b3b4) | ||
1116 | goto fail; | ||
1117 | } else { | ||
1118 | if (v != 0xa1a1a1a1) | ||
1119 | goto fail; | ||
1120 | } | ||
1121 | } | ||
1122 | } | ||
1123 | } | ||
1124 | |||
1125 | fail: | ||
1126 | kfree(p); | ||
1127 | if (i < 256) | ||
1128 | return (i << 24) | (j << 16) | k; | ||
1129 | return 0; | ||
1130 | } | ||
1131 | |||
1132 | static __init int memset64_selftest(void) | ||
1133 | { | ||
1134 | unsigned i, j, k; | ||
1135 | u64 v, *p; | ||
1136 | |||
1137 | p = kmalloc(256 * 2 * 8, GFP_KERNEL); | ||
1138 | if (!p) | ||
1139 | return -1; | ||
1140 | |||
1141 | for (i = 0; i < 256; i++) { | ||
1142 | for (j = 0; j < 256; j++) { | ||
1143 | memset(p, 0xa1, 256 * 2 * sizeof(v)); | ||
1144 | memset64(p + i, 0xb1b2b3b4b5b6b7b8ULL, j); | ||
1145 | for (k = 0; k < 512; k++) { | ||
1146 | v = p[k]; | ||
1147 | if (k < i) { | ||
1148 | if (v != 0xa1a1a1a1a1a1a1a1ULL) | ||
1149 | goto fail; | ||
1150 | } else if (k < i + j) { | ||
1151 | if (v != 0xb1b2b3b4b5b6b7b8ULL) | ||
1152 | goto fail; | ||
1153 | } else { | ||
1154 | if (v != 0xa1a1a1a1a1a1a1a1ULL) | ||
1155 | goto fail; | ||
1156 | } | ||
1157 | } | ||
1158 | } | ||
1159 | } | ||
1160 | |||
1161 | fail: | ||
1162 | kfree(p); | ||
1163 | if (i < 256) | ||
1164 | return (i << 24) | (j << 16) | k; | ||
1165 | return 0; | ||
1166 | } | ||
1167 | |||
1168 | static __init int string_selftest_init(void) | ||
1169 | { | ||
1170 | int test, subtest; | ||
1171 | |||
1172 | test = 1; | ||
1173 | subtest = memset16_selftest(); | ||
1174 | if (subtest) | ||
1175 | goto fail; | ||
1176 | |||
1177 | test = 2; | ||
1178 | subtest = memset32_selftest(); | ||
1179 | if (subtest) | ||
1180 | goto fail; | ||
1181 | |||
1182 | test = 3; | ||
1183 | subtest = memset64_selftest(); | ||
1184 | if (subtest) | ||
1185 | goto fail; | ||
1186 | |||
1187 | pr_info("String selftests succeeded\n"); | ||
1188 | return 0; | ||
1189 | fail: | ||
1190 | pr_crit("String selftest failure %d.%08x\n", test, subtest); | ||
1191 | return 0; | ||
1192 | } | ||
1193 | |||
1194 | module_init(string_selftest_init); | ||
1195 | #endif /* CONFIG_STRING_SELFTEST */ | ||
diff --git a/lib/test_string.c b/lib/test_string.c new file mode 100644 index 000000000000..0fcdb82dca86 --- /dev/null +++ b/lib/test_string.c | |||
@@ -0,0 +1,141 @@ | |||
1 | #include <linux/module.h> | ||
2 | #include <linux/printk.h> | ||
3 | #include <linux/slab.h> | ||
4 | #include <linux/string.h> | ||
5 | |||
6 | static __init int memset16_selftest(void) | ||
7 | { | ||
8 | unsigned i, j, k; | ||
9 | u16 v, *p; | ||
10 | |||
11 | p = kmalloc(256 * 2 * 2, GFP_KERNEL); | ||
12 | if (!p) | ||
13 | return -1; | ||
14 | |||
15 | for (i = 0; i < 256; i++) { | ||
16 | for (j = 0; j < 256; j++) { | ||
17 | memset(p, 0xa1, 256 * 2 * sizeof(v)); | ||
18 | memset16(p + i, 0xb1b2, j); | ||
19 | for (k = 0; k < 512; k++) { | ||
20 | v = p[k]; | ||
21 | if (k < i) { | ||
22 | if (v != 0xa1a1) | ||
23 | goto fail; | ||
24 | } else if (k < i + j) { | ||
25 | if (v != 0xb1b2) | ||
26 | goto fail; | ||
27 | } else { | ||
28 | if (v != 0xa1a1) | ||
29 | goto fail; | ||
30 | } | ||
31 | } | ||
32 | } | ||
33 | } | ||
34 | |||
35 | fail: | ||
36 | kfree(p); | ||
37 | if (i < 256) | ||
38 | return (i << 24) | (j << 16) | k; | ||
39 | return 0; | ||
40 | } | ||
41 | |||
42 | static __init int memset32_selftest(void) | ||
43 | { | ||
44 | unsigned i, j, k; | ||
45 | u32 v, *p; | ||
46 | |||
47 | p = kmalloc(256 * 2 * 4, GFP_KERNEL); | ||
48 | if (!p) | ||
49 | return -1; | ||
50 | |||
51 | for (i = 0; i < 256; i++) { | ||
52 | for (j = 0; j < 256; j++) { | ||
53 | memset(p, 0xa1, 256 * 2 * sizeof(v)); | ||
54 | memset32(p + i, 0xb1b2b3b4, j); | ||
55 | for (k = 0; k < 512; k++) { | ||
56 | v = p[k]; | ||
57 | if (k < i) { | ||
58 | if (v != 0xa1a1a1a1) | ||
59 | goto fail; | ||
60 | } else if (k < i + j) { | ||
61 | if (v != 0xb1b2b3b4) | ||
62 | goto fail; | ||
63 | } else { | ||
64 | if (v != 0xa1a1a1a1) | ||
65 | goto fail; | ||
66 | } | ||
67 | } | ||
68 | } | ||
69 | } | ||
70 | |||
71 | fail: | ||
72 | kfree(p); | ||
73 | if (i < 256) | ||
74 | return (i << 24) | (j << 16) | k; | ||
75 | return 0; | ||
76 | } | ||
77 | |||
78 | static __init int memset64_selftest(void) | ||
79 | { | ||
80 | unsigned i, j, k; | ||
81 | u64 v, *p; | ||
82 | |||
83 | p = kmalloc(256 * 2 * 8, GFP_KERNEL); | ||
84 | if (!p) | ||
85 | return -1; | ||
86 | |||
87 | for (i = 0; i < 256; i++) { | ||
88 | for (j = 0; j < 256; j++) { | ||
89 | memset(p, 0xa1, 256 * 2 * sizeof(v)); | ||
90 | memset64(p + i, 0xb1b2b3b4b5b6b7b8ULL, j); | ||
91 | for (k = 0; k < 512; k++) { | ||
92 | v = p[k]; | ||
93 | if (k < i) { | ||
94 | if (v != 0xa1a1a1a1a1a1a1a1ULL) | ||
95 | goto fail; | ||
96 | } else if (k < i + j) { | ||
97 | if (v != 0xb1b2b3b4b5b6b7b8ULL) | ||
98 | goto fail; | ||
99 | } else { | ||
100 | if (v != 0xa1a1a1a1a1a1a1a1ULL) | ||
101 | goto fail; | ||
102 | } | ||
103 | } | ||
104 | } | ||
105 | } | ||
106 | |||
107 | fail: | ||
108 | kfree(p); | ||
109 | if (i < 256) | ||
110 | return (i << 24) | (j << 16) | k; | ||
111 | return 0; | ||
112 | } | ||
113 | |||
114 | static __init int string_selftest_init(void) | ||
115 | { | ||
116 | int test, subtest; | ||
117 | |||
118 | test = 1; | ||
119 | subtest = memset16_selftest(); | ||
120 | if (subtest) | ||
121 | goto fail; | ||
122 | |||
123 | test = 2; | ||
124 | subtest = memset32_selftest(); | ||
125 | if (subtest) | ||
126 | goto fail; | ||
127 | |||
128 | test = 3; | ||
129 | subtest = memset64_selftest(); | ||
130 | if (subtest) | ||
131 | goto fail; | ||
132 | |||
133 | pr_info("String selftests succeeded\n"); | ||
134 | return 0; | ||
135 | fail: | ||
136 | pr_crit("String selftest failure %d.%08x\n", test, subtest); | ||
137 | return 0; | ||
138 | } | ||
139 | |||
140 | module_init(string_selftest_init); | ||
141 | MODULE_LICENSE("GPL v2"); | ||