diff options
author | Ying Xue <ying.xue@windriver.com> | 2012-08-16 08:09:08 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-08-20 05:26:30 -0400 |
commit | fc0739385ba10f59105e87a46cc93d9d9a10553c (patch) | |
tree | 7ae1ac9f233ed40183e6f5f06b5488b076106389 /net/tipc/link.c | |
parent | 4225a398c1352a7a5c14dc07277cb5cc4473983b (diff) |
tipc: remove pointless name sanity check and tipc_alphabet array
There is no real reason to check whether all letters in the given
media name and network interface name are within the character set
defined in tipc_alphabet array. Even if we eliminate the checking,
the rest of checking conditions in tipc_enable_bearer() can ensure
we do not enable an invalid or illegal bearer.
Signed-off-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/link.c')
-rw-r--r-- | net/tipc/link.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/tipc/link.c b/net/tipc/link.c index 1c1e6151875e..a79c755cb417 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c | |||
@@ -210,9 +210,7 @@ static int link_name_validate(const char *name, | |||
210 | (z_local > 255) || (c_local > 4095) || (n_local > 4095) || | 210 | (z_local > 255) || (c_local > 4095) || (n_local > 4095) || |
211 | (z_peer > 255) || (c_peer > 4095) || (n_peer > 4095) || | 211 | (z_peer > 255) || (c_peer > 4095) || (n_peer > 4095) || |
212 | (if_local_len <= 1) || (if_local_len > TIPC_MAX_IF_NAME) || | 212 | (if_local_len <= 1) || (if_local_len > TIPC_MAX_IF_NAME) || |
213 | (if_peer_len <= 1) || (if_peer_len > TIPC_MAX_IF_NAME) || | 213 | (if_peer_len <= 1) || (if_peer_len > TIPC_MAX_IF_NAME)) |
214 | (strspn(if_local, tipc_alphabet) != (if_local_len - 1)) || | ||
215 | (strspn(if_peer, tipc_alphabet) != (if_peer_len - 1))) | ||
216 | return 0; | 214 | return 0; |
217 | 215 | ||
218 | /* return link name components, if necessary */ | 216 | /* return link name components, if necessary */ |