Use strscpy rather than strlcpy (keep as fallback).

strscpy has been around since 4.3, and strlcpy got removed in 6.8.

This patch switches to the plainly preferred strscpy whenever it is
available, but will define that to strlcpy if strscpy (sized_strscpy due
to strscpy really being a macro) is not available.

Ideally we want to compile a test-call, but kbuild_test_symbol() doesn't
work that way.

We could also simply go "#ifndef strscpy ... # define strscpy strlcpy"
if that would be preferred.

Signed-off-by: Jaco Kroon <jaco@uls.co.za>

Author: jkroonza

compat.h

@@ -178,6 +178,10 @@ static int __ethtool_get_settings(struct net_device *dev, struct ethtool_cmd *cm
 # define NF_IP_POST_ROUTING	NF_INET_POST_ROUTING
 #endif
 
+#ifndef HAVE_SIZED_STRSCPY
+#define strscpy strlcpy
+#endif
+
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
 /* net/netfilter/x_tables.c */
 static void xt_unregister_targets(struct xt_target *target, unsigned int n)

gen_compat_def

@@ -134,6 +134,8 @@ kbuild_test_ref    totalram_pages linux/mm.h
 kbuild_test_member nf_ct_event_notifier.ct_event net/netfilter/nf_conntrack_ecache.h
 # 6.4: 0199849acd07 ("sysctl: remove register_sysctl_paths()")
 kbuild_test_symbol register_sysctl_paths linux/sysctl.h
+# If we have strscpy, we can use that (more optimal compared to strlcpy).
+kbuild_test_symbol sized_strscpy linux/string.h
 
 echo "// End of compat_def.h"
 

ipt_NETFLOW.c

@@ -42,6 +42,7 @@
 #include <linux/spinlock_types.h>
 #include <linux/ktime.h>
 #include <linux/if_arp.h>
+#include <linux/string.h>
 #include <net/icmp.h>
 #include <net/ip.h>
 #include <net/ipv6.h>
@@ -4092,7 +4093,7 @@ static int ethtool_drvinfo(unsigned char *ptr, size_t size, struct net_device *d
 		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);
@@ -5691,7 +5692,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)
@@ -5701,7 +5702,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);
@@ -5711,7 +5712,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);
@@ -5728,7 +5729,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);