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
|
Description: Replace all occurrences of strlcpy with strscpy
Fixes compilation against Linux kernel 6.8 which has strlcpy removed.
Origin: https://github.com/aabc/ipt-netflow/issues/227#issuecomment-2036168081
Bug: https://github.com/aabc/ipt-netflow/issues/227
--- a/ipt_NETFLOW.c
+++ b/ipt_NETFLOW.c
@@ -4107,7 +4107,7 @@ static int ethtool_drvinfo(unsigned char
ops->get_drvinfo(dev, &info);
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)
else if (dev->dev.parent && dev->dev.parent->driver) {
- strlcpy(info.driver, dev->dev.parent->driver->name, sizeof(info.driver));
+ strscpy(info.driver, dev->dev.parent->driver->name, sizeof(info.driver));
}
#endif
n = scnprintf(ptr, len, "%s", info.driver);
@@ -5710,7 +5710,7 @@ static int __init ipt_netflow_init(void)
if (!destination)
destination = destination_buf;
if (destination != destination_buf) {
- strlcpy(destination_buf, destination, sizeof(destination_buf));
+ strscpy(destination_buf, destination, sizeof(destination_buf));
destination = destination_buf;
}
if (add_destinations(destination) < 0)
@@ -5720,7 +5720,7 @@ static int __init ipt_netflow_init(void)
if (!aggregation)
aggregation = aggregation_buf;
if (aggregation != aggregation_buf) {
- strlcpy(aggregation_buf, aggregation, sizeof(aggregation_buf));
+ strscpy(aggregation_buf, aggregation, sizeof(aggregation_buf));
aggregation = aggregation_buf;
}
add_aggregation(aggregation);
@@ -5730,7 +5730,7 @@ static int __init ipt_netflow_init(void)
if (!sampler)
sampler = sampler_buf;
if (sampler != sampler_buf) {
- strlcpy(sampler_buf, sampler, sizeof(sampler_buf));
+ strscpy(sampler_buf, sampler, sizeof(sampler_buf));
sampler = sampler_buf;
}
parse_sampler(sampler);
@@ -5747,7 +5747,7 @@ static int __init ipt_netflow_init(void)
if (!snmp_rules)
snmp_rules = snmp_rules_buf;
if (snmp_rules != snmp_rules_buf) {
- strlcpy(snmp_rules_buf, snmp_rules, sizeof(snmp_rules_buf));
+ strscpy(snmp_rules_buf, snmp_rules, sizeof(snmp_rules_buf));
snmp_rules = snmp_rules_buf;
}
add_snmp_rules(snmp_rules);
--- a/compat.h
+++ b/compat.h
@@ -806,4 +806,8 @@ struct module *find_module(const char *n
# define NF_CT_EVENT const struct nf_ct_event
#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,3,0)
+#define strscpy strlcpy
+#endif
+
#endif /* COMPAT_NETFLOW_H */
|
