aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/bearer.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/tipc/bearer.c')
-rw-r--r--net/tipc/bearer.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
index 09e71241265d..6b2faa57a394 100644
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
@@ -60,7 +60,7 @@ static int media_name_valid(const char *name)
60 len = strlen(name); 60 len = strlen(name);
61 if ((len + 1) > TIPC_MAX_MEDIA_NAME) 61 if ((len + 1) > TIPC_MAX_MEDIA_NAME)
62 return 0; 62 return 0;
63 return strspn(name, tipc_alphabet) == len; 63 return 1;
64} 64}
65 65
66/** 66/**
@@ -206,9 +206,7 @@ static int bearer_name_validate(const char *name,
206 206
207 /* validate component parts of bearer name */ 207 /* validate component parts of bearer name */
208 if ((media_len <= 1) || (media_len > TIPC_MAX_MEDIA_NAME) || 208 if ((media_len <= 1) || (media_len > TIPC_MAX_MEDIA_NAME) ||
209 (if_len <= 1) || (if_len > TIPC_MAX_IF_NAME) || 209 (if_len <= 1) || (if_len > TIPC_MAX_IF_NAME))
210 (strspn(media_name, tipc_alphabet) != (media_len - 1)) ||
211 (strspn(if_name, tipc_alphabet) != (if_len - 1)))
212 return 0; 210 return 0;
213 211
214 /* return bearer name components, if necessary */ 212 /* return bearer name components, if necessary */