Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit fc0739385ba10f59105e87a46cc93d9d9a10553c

Authored by Ying Xue
Committed by David S. Miller
1 parent 4225a398c1

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>

Showing 4 changed files with 3 additions and 12 deletions Side-by-side Diff

... ... @@ -60,7 +60,7 @@
60 60 len = strlen(name);
61 61 if ((len + 1) > TIPC_MAX_MEDIA_NAME)
62 62 return 0;
63   - return strspn(name, tipc_alphabet) == len;
  63 + return 1;
64 64 }
65 65  
66 66 /**
... ... @@ -206,9 +206,7 @@
206 206  
207 207 /* validate component parts of bearer name */
208 208 if ((media_len <= 1) || (media_len > TIPC_MAX_MEDIA_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)))
  209 + (if_len <= 1) || (if_len > TIPC_MAX_IF_NAME))
212 210 return 0;
213 211  
214 212 /* return bearer name components, if necessary */
... ... @@ -50,9 +50,6 @@
50 50 /* global variables used by multiple sub-systems within TIPC */
51 51 int tipc_random;
52 52  
53   -const char tipc_alphabet[] =
54   - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_.";
55   -
56 53 /* configurable TIPC parameters */
57 54 u32 tipc_own_addr;
58 55 int tipc_max_ports;
... ... @@ -85,8 +85,6 @@
85 85 * Other global variables
86 86 */
87 87 extern int tipc_random;
88   -extern const char tipc_alphabet[];
89   -
90 88  
91 89 /*
92 90 * Routines available to privileged subsystems
... ... @@ -210,9 +210,7 @@
210 210 (z_local > 255) || (c_local > 4095) || (n_local > 4095) ||
211 211 (z_peer > 255) || (c_peer > 4095) || (n_peer > 4095) ||
212 212 (if_local_len <= 1) || (if_local_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)))
  213 + (if_peer_len <= 1) || (if_peer_len > TIPC_MAX_IF_NAME))
216 214 return 0;
217 215  
218 216 /* return link name components, if necessary */