ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

string_helpers: Move string_is_valid() to the header

Browse Source 
Move string_is_valid() to the header for wider use.

While at it, rename to string_is_terminated() to be
precise about its semantics.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Link: https://lore.kernel.org/r/20230208133153.22528-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Andy Shevchenko
2023-02-08 15:31:51 +02:00
committed by Jakub Kicinski
parent a136391ae4
commit f1db99c07b
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/linux/string_helpers.h
View File

@@ -11,6 +11,11 @@ struct device;
struct file; struct file;
struct task_struct; struct task_struct;
static inline bool string_is_terminated(const char *s, int len)
{
return memchr(s, '\0', len) ? true : false;
}
/* Descriptions of the types of units to /* Descriptions of the types of units to
* print in */ * print in */
enum string_size_units { enum string_size_units {

16
net/tipc/netlink_compat.c
View File

@@ -39,6 +39,7 @@
#include "node.h" #include "node.h"
#include "net.h" #include "net.h"
#include <net/genetlink.h> #include <net/genetlink.h>
#include <linux/string_helpers.h>
#include <linux/tipc_config.h> #include <linux/tipc_config.h>
/* The legacy API had an artificial message length limit called /* The legacy API had an artificial message length limit called
@@ -173,11 +174,6 @@ static struct sk_buff *tipc_get_err_tlv(char *str)
return buf; return buf;
} }
static inline bool string_is_valid(char *s, int len)
{
return memchr(s, '\0', len) ? true : false;
}
static int __tipc_nl_compat_dumpit(struct tipc_nl_compat_cmd_dump *cmd, static int __tipc_nl_compat_dumpit(struct tipc_nl_compat_cmd_dump *cmd,
struct tipc_nl_compat_msg *msg, struct tipc_nl_compat_msg *msg,
struct sk_buff *arg) struct sk_buff *arg)
@@ -445,7 +441,7 @@ static int tipc_nl_compat_bearer_enable(struct tipc_nl_compat_cmd_doit *cmd,
return -EINVAL; return -EINVAL;
len = min_t(int, len, TIPC_MAX_BEARER_NAME); len = min_t(int, len, TIPC_MAX_BEARER_NAME);
if (!string_is_valid(b->name, len)) if (!string_is_terminated(b->name, len))
return -EINVAL; return -EINVAL;
if (nla_put_string(skb, TIPC_NLA_BEARER_NAME, b->name)) if (nla_put_string(skb, TIPC_NLA_BEARER_NAME, b->name))
@@ -486,7 +482,7 @@ static int tipc_nl_compat_bearer_disable(struct tipc_nl_compat_cmd_doit *cmd,
return -EINVAL; return -EINVAL;
len = min_t(int, len, TIPC_MAX_BEARER_NAME); len = min_t(int, len, TIPC_MAX_BEARER_NAME);
if (!string_is_valid(name, len)) if (!string_is_terminated(name, len))
return -EINVAL; return -EINVAL;
if (nla_put_string(skb, TIPC_NLA_BEARER_NAME, name)) if (nla_put_string(skb, TIPC_NLA_BEARER_NAME, name))
@@ -584,7 +580,7 @@ static int tipc_nl_compat_link_stat_dump(struct tipc_nl_compat_msg *msg,
return -EINVAL; return -EINVAL;
len = min_t(int, len, TIPC_MAX_LINK_NAME); len = min_t(int, len, TIPC_MAX_LINK_NAME);
if (!string_is_valid(name, len)) if (!string_is_terminated(name, len))
return -EINVAL; return -EINVAL;
if (strcmp(name, nla_data(link[TIPC_NLA_LINK_NAME])) != 0) if (strcmp(name, nla_data(link[TIPC_NLA_LINK_NAME])) != 0)
@@ -819,7 +815,7 @@ static int tipc_nl_compat_link_set(struct tipc_nl_compat_cmd_doit *cmd,
return -EINVAL; return -EINVAL;
len = min_t(int, len, TIPC_MAX_LINK_NAME); len = min_t(int, len, TIPC_MAX_LINK_NAME);
if (!string_is_valid(lc->name, len)) if (!string_is_terminated(lc->name, len))
return -EINVAL; return -EINVAL;
media = tipc_media_find(lc->name); media = tipc_media_find(lc->name);
@@ -856,7 +852,7 @@ static int tipc_nl_compat_link_reset_stats(struct tipc_nl_compat_cmd_doit *cmd,
return -EINVAL; return -EINVAL;
len = min_t(int, len, TIPC_MAX_LINK_NAME); len = min_t(int, len, TIPC_MAX_LINK_NAME);
if (!string_is_valid(name, len)) if (!string_is_terminated(name, len))
return -EINVAL; return -EINVAL;
if (nla_put_string(skb, TIPC_NLA_LINK_NAME, name)) if (nla_put_string(skb, TIPC_NLA_LINK_NAME, name))