-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathmodules_ipoe_vlan_mon_kernel5_2
More file actions
203 lines (199 loc) · 4.93 KB
/
modules_ipoe_vlan_mon_kernel5_2
File metadata and controls
203 lines (199 loc) · 4.93 KB
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
diff --git a/drivers/ipoe/ipoe.c b/drivers/ipoe/ipoe.c
index f3acb3f..e840114 100644
--- a/drivers/ipoe/ipoe.c
+++ b/drivers/ipoe/ipoe.c
@@ -57,6 +57,10 @@
#define RHEL_MAJOR 0
#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 2, 0)
+#define INDIVIDUAL_NETLINK_OPS_POLICY
+#endif
+
struct ipoe_stats {
struct u64_stats_sync sync;
u64 packets;
@@ -254,9 +258,12 @@ static int check_nat_required(struct sk_buff *skb, struct net_device *link)
rt = ip_route_output_key(net, &fl4);
if (IS_ERR(rt))
return 0;
-
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)
+ if (rt->rt_gw4 || (rt->dst.dev != link && rt->dst.dev != skb->dev))
+#else
if (rt->rt_gateway || (rt->dst.dev != link && rt->dst.dev != skb->dev))
r = 1;
+#endif
ip_rt_put(rt);
@@ -1745,66 +1752,88 @@ static struct genl_ops ipoe_nl_ops[] = {
{
.cmd = IPOE_CMD_NOOP,
.doit = ipoe_nl_cmd_noop,
+#ifndef INDIVIDUAL_NETLINK_OPS_POLICY
.policy = ipoe_nl_policy,
+#endif
/* can be retrieved by unprivileged users */
},
{
.cmd = IPOE_CMD_CREATE,
.doit = ipoe_nl_cmd_create,
+#ifndef INDIVIDUAL_NETLINK_OPS_POLICY
.policy = ipoe_nl_policy,
+#endif
.flags = GENL_ADMIN_PERM,
},
{
.cmd = IPOE_CMD_DELETE,
.doit = ipoe_nl_cmd_delete,
+#ifndef INDIVIDUAL_NETLINK_OPS_POLICY
.policy = ipoe_nl_policy,
+#endif
.flags = GENL_ADMIN_PERM,
},
{
.cmd = IPOE_CMD_MODIFY,
.doit = ipoe_nl_cmd_modify,
+#ifndef INDIVIDUAL_NETLINK_OPS_POLICY
.policy = ipoe_nl_policy,
+#endif
.flags = GENL_ADMIN_PERM,
},
{
.cmd = IPOE_CMD_GET,
.dumpit = ipoe_nl_cmd_dump_sessions,
+#ifndef INDIVIDUAL_NETLINK_OPS_POLICY
.policy = ipoe_nl_policy,
+#endif
},
{
.cmd = IPOE_CMD_ADD_IF,
.doit = ipoe_nl_cmd_add_interface,
+#ifndef INDIVIDUAL_NETLINK_OPS_POLICY
.policy = ipoe_nl_policy,
+#endif
.flags = GENL_ADMIN_PERM,
},
{
.cmd = IPOE_CMD_DEL_IF,
.doit = ipoe_nl_cmd_del_interface,
+#ifndef INDIVIDUAL_NETLINK_OPS_POLICY
.policy = ipoe_nl_policy,
+#endif
.flags = GENL_ADMIN_PERM,
},
{
.cmd = IPOE_CMD_ADD_EXCLUDE,
.doit = ipoe_nl_cmd_add_exclude,
+#ifndef INDIVIDUAL_NETLINK_OPS_POLICY
.policy = ipoe_nl_policy,
+#endif
.flags = GENL_ADMIN_PERM,
},
{
.cmd = IPOE_CMD_DEL_EXCLUDE,
.doit = ipoe_nl_cmd_del_exclude,
+#ifndef INDIVIDUAL_NETLINK_OPS_POLICY
.policy = ipoe_nl_policy,
+#endif
.flags = GENL_ADMIN_PERM,
},
{
.cmd = IPOE_CMD_ADD_NET,
.doit = ipoe_nl_cmd_add_net,
+#ifndef INDIVIDUAL_NETLINK_OPS_POLICY
.policy = ipoe_nl_policy,
+#endif
.flags = GENL_ADMIN_PERM,
},
{
.cmd = IPOE_CMD_DEL_NET,
.doit = ipoe_nl_cmd_del_net,
+#ifndef INDIVIDUAL_NETLINK_OPS_POLICY
.policy = ipoe_nl_policy,
+#endif
.flags = GENL_ADMIN_PERM,
},
};
@@ -1827,6 +1856,9 @@ static struct genl_family ipoe_nl_family = {
.version = IPOE_GENL_VERSION,
.hdrsize = 0,
.maxattr = IPOE_ATTR_MAX,
+#ifdef INDIVIDUAL_NETLINK_OPS_POLICY
+ .policy = ipoe_nl_policy,
+#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)
.module = THIS_MODULE,
.ops = ipoe_nl_ops,
diff --git a/drivers/vlan_mon/vlan_mon.c b/drivers/vlan_mon/vlan_mon.c
index b6476d4..9c1f7b6 100644
--- a/drivers/vlan_mon/vlan_mon.c
+++ b/drivers/vlan_mon/vlan_mon.c
@@ -43,6 +43,10 @@
#define vlan_tx_tag_present(skb) skb_vlan_tag_present(skb)
#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 2, 0)
+#define INDIVIDUAL_NETLINK_OPS_POLICY
+#endif
+
struct vlan_dev {
unsigned int magic;
int ifindex;
@@ -628,37 +632,49 @@ static struct genl_ops vlan_mon_nl_ops[] = {
{
.cmd = VLAN_MON_CMD_NOOP,
.doit = vlan_mon_nl_cmd_noop,
+#ifndef INDIVIDUAL_NETLINK_OPS_POLICY
.policy = vlan_mon_nl_policy,
+#endif
/* can be retrieved by unprivileged users */
},
{
.cmd = VLAN_MON_CMD_ADD,
.doit = vlan_mon_nl_cmd_add_vlan_mon,
+#ifndef INDIVIDUAL_NETLINK_OPS_POLICY
.policy = vlan_mon_nl_policy,
+#endif
.flags = GENL_ADMIN_PERM,
},
{
.cmd = VLAN_MON_CMD_ADD_VID,
.doit = vlan_mon_nl_cmd_add_vlan_mon_vid,
+#ifndef INDIVIDUAL_NETLINK_OPS_POLICY
.policy = vlan_mon_nl_policy,
+#endif
.flags = GENL_ADMIN_PERM,
},
{
.cmd = VLAN_MON_CMD_DEL,
.doit = vlan_mon_nl_cmd_del_vlan_mon,
+#ifndef INDIVIDUAL_NETLINK_OPS_POLICY
.policy = vlan_mon_nl_policy,
+#endif
.flags = GENL_ADMIN_PERM,
},
{
.cmd = VLAN_MON_CMD_CHECK_BUSY,
.doit = vlan_mon_nl_cmd_check_busy,
+#ifndef INDIVIDUAL_NETLINK_OPS_POLICY
.policy = vlan_mon_nl_policy,
+#endif
.flags = GENL_ADMIN_PERM,
},
{
.cmd = VLAN_MON_CMD_DEL_VID,
.doit = vlan_mon_nl_cmd_del_vlan_mon_vid,
+#ifndef INDIVIDUAL_NETLINK_OPS_POLICY
.policy = vlan_mon_nl_policy,
+#endif
.flags = GENL_ADMIN_PERM,
},
};
@@ -681,6 +697,9 @@ static struct genl_family vlan_mon_nl_family = {
.version = VLAN_MON_GENL_VERSION,
.hdrsize = 0,
.maxattr = VLAN_MON_ATTR_MAX,
+#ifdef INDIVIDUAL_NETLINK_OPS_POLICY
+ .policy = vlan_mon_nl_policy,
+#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)
.module = THIS_MODULE,
.ops = vlan_mon_nl_ops,