summaryrefslogtreecommitdiffstats
path: root/kernel/include/linux/netfilter/ipset
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@netfilter.org>2020-12-14 10:12:57 +0100
committerJozsef Kadlecsik <kadlec@netfilter.org>2020-12-14 10:12:57 +0100
commit8bdd23ceca429ea32d60d869175b8b49093f8eff (patch)
tree102bb19574cd46e926857ccadacffc36025eb16a /kernel/include/linux/netfilter/ipset
parent8cdb9e6b30a5f9cad924e20febb8a560b232802e (diff)
Backward compatibility: handle missing strscpy with a wrapper of strlcpy.
Signed-off-by: Jozsef Kadlecsik <kadlec@netfilter.org>
Diffstat (limited to 'kernel/include/linux/netfilter/ipset')
-rw-r--r--kernel/include/linux/netfilter/ipset/ip_set_compat.h.in7
1 files changed, 6 insertions, 1 deletions
diff --git a/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in b/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in
index bf99bc0..eecf330 100644
--- a/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in
+++ b/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in
@@ -446,7 +446,12 @@ static inline u16 nfnl_msg_type(u8 subsys, u8 msg_type)
#endif
#ifndef HAVE_STRSCPY
-#define strscpy(dst, src, n) (strncpy(dst, src, n) == (dst))
+static inline ssize_t strscpy(char * dest, const char * src, size_t count)
+{
+ size_t ret = strlcpy(dest, src, count);
+
+ return (ret >= count ? -E2BIG : ret);
+}
#endif
#ifndef smp_mb__before_atomic