Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 064b5bba0cc495201729285c6a6ce205df0a386a

Authored by Eric W. Biederman
Committed by Linus Torvalds
1 parent 35834ca1e4
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

sysctl: remove broken netfilter binary sysctls 

No one has bothered to set strategy routine for the the netfilter sysctls that
return jiffies to be sysctl_jiffies.

So it appears the sys_sysctl path is unused and untested, so this patch
removes the binary sysctl numbers.

Which fixes the netfilter oops in 2.6.23-rc2-mm2 for me.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Cc: Patrick McHardy <kaber@trash.net>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 7 changed files with 0 additions and 42 deletions Side-by-side Diff

net/ipv4/netfilter/nf_conntrack_proto_icmp.c
Diff comments   View file @ 064b5bb
... ... @@ -281,7 +281,6 @@
281 281 static struct ctl_table_header *icmp_sysctl_header;
282 282 static struct ctl_table icmp_sysctl_table[] = {
283 283 {
284   - .ctl_name = NET_NF_CONNTRACK_ICMP_TIMEOUT,
285 284 .procname = "nf_conntrack_icmp_timeout",
286 285 .data = &nf_ct_icmp_timeout,
287 286 .maxlen = sizeof(unsigned int),
... ... @@ -295,7 +294,6 @@
295 294 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
296 295 static struct ctl_table icmp_compat_sysctl_table[] = {
297 296 {
298   - .ctl_name = NET_IPV4_NF_CONNTRACK_ICMP_TIMEOUT,
299 297 .procname = "ip_conntrack_icmp_timeout",
300 298 .data = &nf_ct_icmp_timeout,
301 299 .maxlen = sizeof(unsigned int),
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
Diff comments   View file @ 064b5bb
... ... @@ -306,7 +306,6 @@
306 306 #ifdef CONFIG_SYSCTL
307 307 static ctl_table nf_ct_ipv6_sysctl_table[] = {
308 308 {
309   - .ctl_name = NET_NF_CONNTRACK_FRAG6_TIMEOUT,
310 309 .procname = "nf_conntrack_frag6_timeout",
311 310 .data = &nf_frags_ctl.timeout,
312 311 .maxlen = sizeof(unsigned int),
net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
Diff comments   View file @ 064b5bb
... ... @@ -260,7 +260,6 @@
260 260 static struct ctl_table_header *icmpv6_sysctl_header;
261 261 static struct ctl_table icmpv6_sysctl_table[] = {
262 262 {
263   - .ctl_name = NET_NF_CONNTRACK_ICMPV6_TIMEOUT,
264 263 .procname = "nf_conntrack_icmpv6_timeout",
265 264 .data = &nf_ct_icmpv6_timeout,
266 265 .maxlen = sizeof(unsigned int),
net/netfilter/nf_conntrack_proto_generic.c
Diff comments   View file @ 064b5bb
... ... @@ -70,7 +70,6 @@
70 70 static struct ctl_table_header *generic_sysctl_header;
71 71 static struct ctl_table generic_sysctl_table[] = {
72 72 {
73   - .ctl_name = NET_NF_CONNTRACK_GENERIC_TIMEOUT,
74 73 .procname = "nf_conntrack_generic_timeout",
75 74 .data = &nf_ct_generic_timeout,
76 75 .maxlen = sizeof(unsigned int),
... ... @@ -84,7 +83,6 @@
84 83 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
85 84 static struct ctl_table generic_compat_sysctl_table[] = {
86 85 {
87   - .ctl_name = NET_IPV4_NF_CONNTRACK_GENERIC_TIMEOUT,
88 86 .procname = "ip_conntrack_generic_timeout",
89 87 .data = &nf_ct_generic_timeout,
90 88 .maxlen = sizeof(unsigned int),
net/netfilter/nf_conntrack_proto_sctp.c
Diff comments   View file @ 064b5bb
... ... @@ -476,7 +476,6 @@
476 476 static struct ctl_table_header *sctp_sysctl_header;
477 477 static struct ctl_table sctp_sysctl_table[] = {
478 478 {
479   - .ctl_name = NET_NF_CONNTRACK_SCTP_TIMEOUT_CLOSED,
480 479 .procname = "nf_conntrack_sctp_timeout_closed",
481 480 .data = &nf_ct_sctp_timeout_closed,
482 481 .maxlen = sizeof(unsigned int),
... ... @@ -484,7 +483,6 @@
484 483 .proc_handler = &proc_dointvec_jiffies,
485 484 },
486 485 {
487   - .ctl_name = NET_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_WAIT,
488 486 .procname = "nf_conntrack_sctp_timeout_cookie_wait",
489 487 .data = &nf_ct_sctp_timeout_cookie_wait,
490 488 .maxlen = sizeof(unsigned int),
... ... @@ -492,7 +490,6 @@
492 490 .proc_handler = &proc_dointvec_jiffies,
493 491 },
494 492 {
495   - .ctl_name = NET_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_ECHOED,
496 493 .procname = "nf_conntrack_sctp_timeout_cookie_echoed",
497 494 .data = &nf_ct_sctp_timeout_cookie_echoed,
498 495 .maxlen = sizeof(unsigned int),
... ... @@ -500,7 +497,6 @@
500 497 .proc_handler = &proc_dointvec_jiffies,
501 498 },
502 499 {
503   - .ctl_name = NET_NF_CONNTRACK_SCTP_TIMEOUT_ESTABLISHED,
504 500 .procname = "nf_conntrack_sctp_timeout_established",
505 501 .data = &nf_ct_sctp_timeout_established,
506 502 .maxlen = sizeof(unsigned int),
... ... @@ -508,7 +504,6 @@
508 504 .proc_handler = &proc_dointvec_jiffies,
509 505 },
510 506 {
511   - .ctl_name = NET_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_SENT,
512 507 .procname = "nf_conntrack_sctp_timeout_shutdown_sent",
513 508 .data = &nf_ct_sctp_timeout_shutdown_sent,
514 509 .maxlen = sizeof(unsigned int),
... ... @@ -516,7 +511,6 @@
516 511 .proc_handler = &proc_dointvec_jiffies,
517 512 },
518 513 {
519   - .ctl_name = NET_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_RECD,
520 514 .procname = "nf_conntrack_sctp_timeout_shutdown_recd",
521 515 .data = &nf_ct_sctp_timeout_shutdown_recd,
522 516 .maxlen = sizeof(unsigned int),
... ... @@ -524,7 +518,6 @@
524 518 .proc_handler = &proc_dointvec_jiffies,
525 519 },
526 520 {
527   - .ctl_name = NET_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_ACK_SENT,
528 521 .procname = "nf_conntrack_sctp_timeout_shutdown_ack_sent",
529 522 .data = &nf_ct_sctp_timeout_shutdown_ack_sent,
530 523 .maxlen = sizeof(unsigned int),
... ... @@ -539,7 +532,6 @@
539 532 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
540 533 static struct ctl_table sctp_compat_sysctl_table[] = {
541 534 {
542   - .ctl_name = NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_CLOSED,
543 535 .procname = "ip_conntrack_sctp_timeout_closed",
544 536 .data = &nf_ct_sctp_timeout_closed,
545 537 .maxlen = sizeof(unsigned int),
... ... @@ -547,7 +539,6 @@
547 539 .proc_handler = &proc_dointvec_jiffies,
548 540 },
549 541 {
550   - .ctl_name = NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_WAIT,
551 542 .procname = "ip_conntrack_sctp_timeout_cookie_wait",
552 543 .data = &nf_ct_sctp_timeout_cookie_wait,
553 544 .maxlen = sizeof(unsigned int),
... ... @@ -555,7 +546,6 @@
555 546 .proc_handler = &proc_dointvec_jiffies,
556 547 },
557 548 {
558   - .ctl_name = NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_ECHOED,
559 549 .procname = "ip_conntrack_sctp_timeout_cookie_echoed",
560 550 .data = &nf_ct_sctp_timeout_cookie_echoed,
561 551 .maxlen = sizeof(unsigned int),
... ... @@ -563,7 +553,6 @@
563 553 .proc_handler = &proc_dointvec_jiffies,
564 554 },
565 555 {
566   - .ctl_name = NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_ESTABLISHED,
567 556 .procname = "ip_conntrack_sctp_timeout_established",
568 557 .data = &nf_ct_sctp_timeout_established,
569 558 .maxlen = sizeof(unsigned int),
... ... @@ -571,7 +560,6 @@
571 560 .proc_handler = &proc_dointvec_jiffies,
572 561 },
573 562 {
574   - .ctl_name = NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_SENT,
575 563 .procname = "ip_conntrack_sctp_timeout_shutdown_sent",
576 564 .data = &nf_ct_sctp_timeout_shutdown_sent,
577 565 .maxlen = sizeof(unsigned int),
... ... @@ -579,7 +567,6 @@
579 567 .proc_handler = &proc_dointvec_jiffies,
580 568 },
581 569 {
582   - .ctl_name = NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_RECD,
583 570 .procname = "ip_conntrack_sctp_timeout_shutdown_recd",
584 571 .data = &nf_ct_sctp_timeout_shutdown_recd,
585 572 .maxlen = sizeof(unsigned int),
... ... @@ -587,7 +574,6 @@
587 574 .proc_handler = &proc_dointvec_jiffies,
588 575 },
589 576 {
590   - .ctl_name = NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_ACK_SENT,
591 577 .procname = "ip_conntrack_sctp_timeout_shutdown_ack_sent",
592 578 .data = &nf_ct_sctp_timeout_shutdown_ack_sent,
593 579 .maxlen = sizeof(unsigned int),
net/netfilter/nf_conntrack_proto_tcp.c
Diff comments   View file @ 064b5bb
... ... @@ -1162,7 +1162,6 @@
1162 1162 static struct ctl_table_header *tcp_sysctl_header;
1163 1163 static struct ctl_table tcp_sysctl_table[] = {
1164 1164 {
1165   - .ctl_name = NET_NF_CONNTRACK_TCP_TIMEOUT_SYN_SENT,
1166 1165 .procname = "nf_conntrack_tcp_timeout_syn_sent",
1167 1166 .data = &nf_ct_tcp_timeout_syn_sent,
1168 1167 .maxlen = sizeof(unsigned int),
... ... @@ -1170,7 +1169,6 @@
1170 1169 .proc_handler = &proc_dointvec_jiffies,
1171 1170 },
1172 1171 {
1173   - .ctl_name = NET_NF_CONNTRACK_TCP_TIMEOUT_SYN_RECV,
1174 1172 .procname = "nf_conntrack_tcp_timeout_syn_recv",
1175 1173 .data = &nf_ct_tcp_timeout_syn_recv,
1176 1174 .maxlen = sizeof(unsigned int),
... ... @@ -1178,7 +1176,6 @@
1178 1176 .proc_handler = &proc_dointvec_jiffies,
1179 1177 },
1180 1178 {
1181   - .ctl_name = NET_NF_CONNTRACK_TCP_TIMEOUT_ESTABLISHED,
1182 1179 .procname = "nf_conntrack_tcp_timeout_established",
1183 1180 .data = &nf_ct_tcp_timeout_established,
1184 1181 .maxlen = sizeof(unsigned int),
... ... @@ -1186,7 +1183,6 @@
1186 1183 .proc_handler = &proc_dointvec_jiffies,
1187 1184 },
1188 1185 {
1189   - .ctl_name = NET_NF_CONNTRACK_TCP_TIMEOUT_FIN_WAIT,
1190 1186 .procname = "nf_conntrack_tcp_timeout_fin_wait",
1191 1187 .data = &nf_ct_tcp_timeout_fin_wait,
1192 1188 .maxlen = sizeof(unsigned int),
... ... @@ -1194,7 +1190,6 @@
1194 1190 .proc_handler = &proc_dointvec_jiffies,
1195 1191 },
1196 1192 {
1197   - .ctl_name = NET_NF_CONNTRACK_TCP_TIMEOUT_CLOSE_WAIT,
1198 1193 .procname = "nf_conntrack_tcp_timeout_close_wait",
1199 1194 .data = &nf_ct_tcp_timeout_close_wait,
1200 1195 .maxlen = sizeof(unsigned int),
... ... @@ -1202,7 +1197,6 @@
1202 1197 .proc_handler = &proc_dointvec_jiffies,
1203 1198 },
1204 1199 {
1205   - .ctl_name = NET_NF_CONNTRACK_TCP_TIMEOUT_LAST_ACK,
1206 1200 .procname = "nf_conntrack_tcp_timeout_last_ack",
1207 1201 .data = &nf_ct_tcp_timeout_last_ack,
1208 1202 .maxlen = sizeof(unsigned int),
... ... @@ -1210,7 +1204,6 @@
1210 1204 .proc_handler = &proc_dointvec_jiffies,
1211 1205 },
1212 1206 {
1213   - .ctl_name = NET_NF_CONNTRACK_TCP_TIMEOUT_TIME_WAIT,
1214 1207 .procname = "nf_conntrack_tcp_timeout_time_wait",
1215 1208 .data = &nf_ct_tcp_timeout_time_wait,
1216 1209 .maxlen = sizeof(unsigned int),
... ... @@ -1218,7 +1211,6 @@
1218 1211 .proc_handler = &proc_dointvec_jiffies,
1219 1212 },
1220 1213 {
1221   - .ctl_name = NET_NF_CONNTRACK_TCP_TIMEOUT_CLOSE,
1222 1214 .procname = "nf_conntrack_tcp_timeout_close",
1223 1215 .data = &nf_ct_tcp_timeout_close,
1224 1216 .maxlen = sizeof(unsigned int),
... ... @@ -1226,7 +1218,6 @@
1226 1218 .proc_handler = &proc_dointvec_jiffies,
1227 1219 },
1228 1220 {
1229   - .ctl_name = NET_NF_CONNTRACK_TCP_TIMEOUT_MAX_RETRANS,
1230 1221 .procname = "nf_conntrack_tcp_timeout_max_retrans",
1231 1222 .data = &nf_ct_tcp_timeout_max_retrans,
1232 1223 .maxlen = sizeof(unsigned int),
... ... @@ -1265,7 +1256,6 @@
1265 1256 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
1266 1257 static struct ctl_table tcp_compat_sysctl_table[] = {
1267 1258 {
1268   - .ctl_name = NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_SYN_SENT,
1269 1259 .procname = "ip_conntrack_tcp_timeout_syn_sent",
1270 1260 .data = &nf_ct_tcp_timeout_syn_sent,
1271 1261 .maxlen = sizeof(unsigned int),
... ... @@ -1273,7 +1263,6 @@
1273 1263 .proc_handler = &proc_dointvec_jiffies,
1274 1264 },
1275 1265 {
1276   - .ctl_name = NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_SYN_RECV,
1277 1266 .procname = "ip_conntrack_tcp_timeout_syn_recv",
1278 1267 .data = &nf_ct_tcp_timeout_syn_recv,
1279 1268 .maxlen = sizeof(unsigned int),
... ... @@ -1281,7 +1270,6 @@
1281 1270 .proc_handler = &proc_dointvec_jiffies,
1282 1271 },
1283 1272 {
1284   - .ctl_name = NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_ESTABLISHED,
1285 1273 .procname = "ip_conntrack_tcp_timeout_established",
1286 1274 .data = &nf_ct_tcp_timeout_established,
1287 1275 .maxlen = sizeof(unsigned int),
... ... @@ -1289,7 +1277,6 @@
1289 1277 .proc_handler = &proc_dointvec_jiffies,
1290 1278 },
1291 1279 {
1292   - .ctl_name = NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_FIN_WAIT,
1293 1280 .procname = "ip_conntrack_tcp_timeout_fin_wait",
1294 1281 .data = &nf_ct_tcp_timeout_fin_wait,
1295 1282 .maxlen = sizeof(unsigned int),
... ... @@ -1297,7 +1284,6 @@
1297 1284 .proc_handler = &proc_dointvec_jiffies,
1298 1285 },
1299 1286 {
1300   - .ctl_name = NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_CLOSE_WAIT,
1301 1287 .procname = "ip_conntrack_tcp_timeout_close_wait",
1302 1288 .data = &nf_ct_tcp_timeout_close_wait,
1303 1289 .maxlen = sizeof(unsigned int),
... ... @@ -1305,7 +1291,6 @@
1305 1291 .proc_handler = &proc_dointvec_jiffies,
1306 1292 },
1307 1293 {
1308   - .ctl_name = NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_LAST_ACK,
1309 1294 .procname = "ip_conntrack_tcp_timeout_last_ack",
1310 1295 .data = &nf_ct_tcp_timeout_last_ack,
1311 1296 .maxlen = sizeof(unsigned int),
... ... @@ -1313,7 +1298,6 @@
1313 1298 .proc_handler = &proc_dointvec_jiffies,
1314 1299 },
1315 1300 {
1316   - .ctl_name = NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_TIME_WAIT,
1317 1301 .procname = "ip_conntrack_tcp_timeout_time_wait",
1318 1302 .data = &nf_ct_tcp_timeout_time_wait,
1319 1303 .maxlen = sizeof(unsigned int),
... ... @@ -1321,7 +1305,6 @@
1321 1305 .proc_handler = &proc_dointvec_jiffies,
1322 1306 },
1323 1307 {
1324   - .ctl_name = NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_CLOSE,
1325 1308 .procname = "ip_conntrack_tcp_timeout_close",
1326 1309 .data = &nf_ct_tcp_timeout_close,
1327 1310 .maxlen = sizeof(unsigned int),
... ... @@ -1329,7 +1312,6 @@
1329 1312 .proc_handler = &proc_dointvec_jiffies,
1330 1313 },
1331 1314 {
1332   - .ctl_name = NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_MAX_RETRANS,
1333 1315 .procname = "ip_conntrack_tcp_timeout_max_retrans",
1334 1316 .data = &nf_ct_tcp_timeout_max_retrans,
1335 1317 .maxlen = sizeof(unsigned int),
net/netfilter/nf_conntrack_proto_udp.c
Diff comments   View file @ 064b5bb
... ... @@ -146,7 +146,6 @@
146 146 static struct ctl_table_header *udp_sysctl_header;
147 147 static struct ctl_table udp_sysctl_table[] = {
148 148 {
149   - .ctl_name = NET_NF_CONNTRACK_UDP_TIMEOUT,
150 149 .procname = "nf_conntrack_udp_timeout",
151 150 .data = &nf_ct_udp_timeout,
152 151 .maxlen = sizeof(unsigned int),
... ... @@ -154,7 +153,6 @@
154 153 .proc_handler = &proc_dointvec_jiffies,
155 154 },
156 155 {
157   - .ctl_name = NET_NF_CONNTRACK_UDP_TIMEOUT_STREAM,
158 156 .procname = "nf_conntrack_udp_timeout_stream",
159 157 .data = &nf_ct_udp_timeout_stream,
160 158 .maxlen = sizeof(unsigned int),
... ... @@ -168,7 +166,6 @@
168 166 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
169 167 static struct ctl_table udp_compat_sysctl_table[] = {
170 168 {
171   - .ctl_name = NET_IPV4_NF_CONNTRACK_UDP_TIMEOUT,
172 169 .procname = "ip_conntrack_udp_timeout",
173 170 .data = &nf_ct_udp_timeout,
174 171 .maxlen = sizeof(unsigned int),
... ... @@ -176,7 +173,6 @@
176 173 .proc_handler = &proc_dointvec_jiffies,
177 174 },
178 175 {
179   - .ctl_name = NET_IPV4_NF_CONNTRACK_UDP_TIMEOUT_STREAM,
180 176 .procname = "ip_conntrack_udp_timeout_stream",
181 177 .data = &nf_ct_udp_timeout_stream,
182 178 .maxlen = sizeof(unsigned int),