Skip to content

Commit f4ad77d

Browse files
madaidanmadaidan
committed
Make more sysctl constants read-only
1 parent 95574b9 commit f4ad77d

File tree

14 files changed

+113
-113
lines changed

14 files changed

+113
-113
lines changed

‎ipc/mq_sysctl.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ static int proc_mq_dointvec_minmax(struct ctl_table *table, int write,
4343
#define proc_mq_dointvec_minmax NULL
4444
#endif
4545

46-
static int msg_max_limit_min = MIN_MSGMAX;
47-
static int msg_max_limit_max = HARD_MSGMAX;
46+
static int msg_max_limit_min __read_only = MIN_MSGMAX;
47+
static int msg_max_limit_max __read_only = HARD_MSGMAX;
4848

49-
static int msg_maxsize_limit_min = MIN_MSGSIZEMAX;
50-
static int msg_maxsize_limit_max = HARD_MSGSIZEMAX;
49+
static int msg_maxsize_limit_min __read_only = MIN_MSGSIZEMAX;
50+
static int msg_maxsize_limit_max __read_only = HARD_MSGSIZEMAX;
5151

5252
static struct ctl_table mq_sysctls[] = {
5353
{

‎kernel/sysctl-test.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
#define KUNIT_PROC_READ 0
1010
#define KUNIT_PROC_WRITE 1
1111

12-
static int i_zero;
13-
static int i_one_hundred = 100;
12+
static int i_zero __read_only;
13+
static int i_one_hundred __read_only = 100;
1414

1515
/*
1616
* Test that proc_dointvec will not try to use a NULL .data field even when the

‎lib/test_sysctl.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
#include <linux/delay.h>
3737
#include <linux/vmalloc.h>
3838

39-
static int i_zero;
40-
static int i_one_hundred = 100;
39+
static int i_zero __read_only;
40+
static int i_one_hundred __read_only = 100;
4141

4242
struct test_sysctl_data {
4343
int int_0001;

‎net/ax25/sysctl_net_ax25.c‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@
99
#include <linux/spinlock.h>
1010
#include <net/ax25.h>
1111

12-
static int min_ipdefmode[1], max_ipdefmode[] = {1};
13-
static int min_axdefmode[1], max_axdefmode[] = {1};
14-
static int min_backoff[1], max_backoff[] = {2};
15-
static int min_conmode[1], max_conmode[] = {2};
16-
static int min_window[] = {1}, max_window[] = {7};
17-
static int min_ewindow[] = {1}, max_ewindow[] = {63};
18-
static int min_t1[] = {1}, max_t1[] = {30000};
19-
static int min_t2[] = {1}, max_t2[] = {20000};
20-
static int min_t3[1], max_t3[] = {3600000};
21-
static int min_idle[1], max_idle[] = {65535000};
22-
static int min_n2[] = {1}, max_n2[] = {31};
23-
static int min_paclen[] = {1}, max_paclen[] = {512};
24-
static int min_proto[1], max_proto[] = { AX25_PROTO_MAX };
12+
static int min_ipdefmode[1], max_ipdefmode[] __read_only = {1};
13+
static int min_axdefmode[1], max_axdefmode[] __read_only = {1};
14+
static int min_backoff[1], max_backoff[] __read_only = {2};
15+
static int min_conmode[1], max_conmode[] __read_only = {2};
16+
static int min_window[] __read_only = {1}, max_window[] __read_only = {7};
17+
static int min_ewindow[] __read_only = {1}, max_ewindow[] __read_only = {63};
18+
static int min_t1[] __read_only = {1}, max_t1[] __read_only = {30000};
19+
static int min_t2[] __read_only = {1}, max_t2[] __read_only = {20000};
20+
static int min_t3[1], max_t3[] __read_only = {3600000};
21+
static int min_idle[1], max_idle[] __read_only = {65535000};
22+
static int min_n2[] __read_only = {1}, max_n2[] __read_only = {31};
23+
static int min_paclen[] __read_only = {1}, max_paclen[] __read_only = {512};
24+
static int min_proto[1], max_proto[] __read_only = { AX25_PROTO_MAX };
2525
#ifdef CONFIG_AX25_DAMA_SLAVE
26-
static int min_ds_timeout[1], max_ds_timeout[] = {65535000};
26+
static int min_ds_timeout[1], max_ds_timeout[] __read_only = {65535000};
2727
#endif
2828

2929
static const struct ctl_table ax25_param_table[] = {

‎net/core/sysctl_net_core.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
#include <net/busy_poll.h>
2323
#include <net/pkt_sched.h>
2424

25-
static int two = 2;
26-
static int three = 3;
27-
static int min_sndbuf = SOCK_MIN_SNDBUF;
28-
static int min_rcvbuf = SOCK_MIN_RCVBUF;
29-
static int max_skb_frags = MAX_SKB_FRAGS;
30-
static long long_one __maybe_unused = 1;
31-
static long long_max __maybe_unused = LONG_MAX;
25+
static int two __read_only = 2;
26+
static int three __read_only = 3;
27+
static int min_sndbuf __read_only = SOCK_MIN_SNDBUF;
28+
static int min_rcvbuf __read_only = SOCK_MIN_RCVBUF;
29+
static int max_skb_frags __read_only = MAX_SKB_FRAGS;
30+
static long long_one __maybe_unused __read_only = 1;
31+
static long long_max __maybe_unused __read_only = LONG_MAX;
3232

3333
static int net_msg_warn; /* Unused, but still a sysctl */
3434

‎net/decnet/sysctl_net_decnet.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ int sysctl_decnet_rmem[3] = { 4 * 1024, 87380, 87380 * 2 };
4545

4646
#ifdef CONFIG_SYSCTL
4747
extern int decnet_dst_gc_interval;
48-
static int min_decnet_time_wait[] = { 5 };
49-
static int max_decnet_time_wait[] = { 600 };
50-
static int min_state_count[] = { 1 };
51-
static int max_state_count[] = { NSP_MAXRXTSHIFT };
52-
static int min_decnet_dst_gc_interval[] = { 1 };
53-
static int max_decnet_dst_gc_interval[] = { 60 };
54-
static int min_decnet_no_fc_max_cwnd[] = { NSP_MIN_WINDOW };
55-
static int max_decnet_no_fc_max_cwnd[] = { NSP_MAX_WINDOW };
48+
static int min_decnet_time_wait[] __read_only = { 5 };
49+
static int max_decnet_time_wait[] __read_only = { 600 };
50+
static int min_state_count[] __read_only = { 1 };
51+
static int max_state_count[] __read_only = { NSP_MAXRXTSHIFT };
52+
static int min_decnet_dst_gc_interval[] __read_only = { 1 };
53+
static int max_decnet_dst_gc_interval[] __read_only = { 60 };
54+
static int min_decnet_no_fc_max_cwnd[] __read_only = { NSP_MIN_WINDOW };
55+
static int max_decnet_no_fc_max_cwnd[] __read_only = { NSP_MAX_WINDOW };
5656
static char node_name[7] = "???";
5757

5858
static struct ctl_table_header *dn_table_header = NULL;

‎net/ipv4/sysctl_net_ipv4.c‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -28,28 +28,28 @@
2828
#include <net/protocol.h>
2929
#include <net/netevent.h>
3030

31-
static int two = 2;
32-
static int four = 4;
33-
static int thousand = 1000;
34-
static int gso_max_segs = GSO_MAX_SEGS;
35-
static int tcp_retr1_max = 255;
36-
static int ip_local_port_range_min[] = { 1, 1 };
37-
static int ip_local_port_range_max[] = { 65535, 65535 };
38-
static int tcp_adv_win_scale_min = -31;
39-
static int tcp_adv_win_scale_max = 31;
40-
static int tcp_min_snd_mss_min = TCP_MIN_SND_MSS;
41-
static int tcp_min_snd_mss_max = 65535;
42-
static int ip_privileged_port_min;
43-
static int ip_privileged_port_max = 65535;
44-
static int ip_ttl_min = 1;
45-
static int ip_ttl_max = 255;
46-
static int tcp_syn_retries_min = 1;
47-
static int tcp_syn_retries_max = MAX_TCP_SYNCNT;
48-
static int ip_ping_group_range_min[] = { 0, 0 };
49-
static int ip_ping_group_range_max[] = { GID_T_MAX, GID_T_MAX };
50-
static int comp_sack_nr_max = 255;
51-
static u32 u32_max_div_HZ = UINT_MAX / HZ;
52-
static int one_day_secs = 24 * 3600;
31+
static int two __read_only = 2;
32+
static int four __read_only = 4;
33+
static int thousand __read_only = 1000;
34+
static int gso_max_segs __read_only = GSO_MAX_SEGS;
35+
static int tcp_retr1_max __read_only = 255;
36+
static int ip_local_port_range_min[] __read_only = { 1, 1 };
37+
static int ip_local_port_range_max[] __read_only = { 65535, 65535 };
38+
static int tcp_adv_win_scale_min __read_only = -31;
39+
static int tcp_adv_win_scale_max __read_only = 31;
40+
static int tcp_min_snd_mss_min __read_only = TCP_MIN_SND_MSS;
41+
static int tcp_min_snd_mss_max __read_only = 65535;
42+
static int ip_privileged_port_min __read_only;
43+
static int ip_privileged_port_max __read_only = 65535;
44+
static int ip_ttl_min __read_only = 1;
45+
static int ip_ttl_max __read_only = 255;
46+
static int tcp_syn_retries_min __read_only = 1;
47+
static int tcp_syn_retries_max __read_only = MAX_TCP_SYNCNT;
48+
static int ip_ping_group_range_min[] __read_only = { 0, 0 };
49+
static int ip_ping_group_range_max[] __read_only = { GID_T_MAX, GID_T_MAX };
50+
static int comp_sack_nr_max __read_only = 255;
51+
static u32 u32_max_div_HZ __read_only = UINT_MAX / HZ;
52+
static int one_day_secs __read_only = 24 * 3600;
5353

5454
/* obsolete */
5555
static int sysctl_tcp_low_latency __read_mostly;

‎net/ipv6/sysctl_net_ipv6.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
#include <net/calipso.h>
2222
#endif
2323

24-
static int two = 2;
25-
static int flowlabel_reflect_max = 0x7;
26-
static int auto_flowlabels_min;
27-
static int auto_flowlabels_max = IP6_AUTO_FLOW_LABEL_MAX;
24+
static int two __read_only = 2;
25+
static int flowlabel_reflect_max __read_only = 0x7;
26+
static int auto_flowlabels_min __read_only;
27+
static int auto_flowlabels_max __read_only = IP6_AUTO_FLOW_LABEL_MAX;
2828

2929
static int proc_rt6_multipath_hash_policy(struct ctl_table *table, int write,
3030
void *buffer, size_t *lenp, loff_t *ppos)

‎net/netrom/sysctl_net_netrom.c‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@
1212
/*
1313
* Values taken from NET/ROM documentation.
1414
*/
15-
static int min_quality[] = {0}, max_quality[] = {255};
16-
static int min_obs[] = {0}, max_obs[] = {255};
17-
static int min_ttl[] = {0}, max_ttl[] = {255};
18-
static int min_t1[] = {5 * HZ};
19-
static int max_t1[] = {600 * HZ};
20-
static int min_n2[] = {2}, max_n2[] = {127};
21-
static int min_t2[] = {1 * HZ};
22-
static int max_t2[] = {60 * HZ};
23-
static int min_t4[] = {1 * HZ};
24-
static int max_t4[] = {1000 * HZ};
25-
static int min_window[] = {1}, max_window[] = {127};
26-
static int min_idle[] = {0 * HZ};
27-
static int max_idle[] = {65535 * HZ};
28-
static int min_route[] = {0}, max_route[] = {1};
29-
static int min_fails[] = {1}, max_fails[] = {10};
30-
static int min_reset[] = {0}, max_reset[] = {1};
15+
static int min_quality[] __read_only = {0}, max_quality[] __read_only = {255};
16+
static int min_obs[] __read_only = {0}, max_obs[] __read_only = {255};
17+
static int min_ttl[] __read_only = {0}, max_ttl[] __read_only = {255};
18+
static int min_t1[] __read_only = {5 * HZ};
19+
static int max_t1[] __read_only = {600 * HZ};
20+
static int min_n2[] __read_only = {2}, max_n2[] __read_only = {127};
21+
static int min_t2[] __read_only = {1 * HZ};
22+
static int max_t2[] __read_only = {60 * HZ};
23+
static int min_t4[] __read_only = {1 * HZ};
24+
static int max_t4[] __read_only = {1000 * HZ};
25+
static int min_window[] __read_only = {1}, max_window[] __read_only = {127};
26+
static int min_idle[] __read_only = {0 * HZ};
27+
static int max_idle[] __read_only = {65535 * HZ};
28+
static int min_route[] __read_only = {0}, max_route[] __read_only = {1};
29+
static int min_fails[] __read_only = {1}, max_fails[] __read_only = {10};
30+
static int min_reset[] __read_only = {0}, max_reset[] __read_only = {1};
3131

3232
static struct ctl_table_header *nr_table_header;
3333

‎net/phonet/sysctl.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
#define DYNAMIC_PORT_MAX 0x7f
2323

2424
static DEFINE_SEQLOCK(local_port_range_lock);
25-
static int local_port_range_min[2] = {0, 0};
26-
static int local_port_range_max[2] = {1023, 1023};
25+
static int local_port_range_min[2] __read_only = {0, 0};
26+
static int local_port_range_max[2] __read_only = {1023, 1023};
2727
static int local_port_range[2] = {DYNAMIC_PORT_MIN, DYNAMIC_PORT_MAX};
2828
static struct ctl_table_header *phonet_table_hrd;
2929

0 commit comments

Comments
 (0)