[IRDA]: Fix compiler warning in af_irda.c

f4e37670 · Jean Tourrilhes · Stephen Hemminger · d80fb43e · f4e37670
Commit f4e37670 authored Jan 08, 2004 by Jean Tourrilhes Committed by Stephen Hemminger Jan 08, 2004
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

net/irda/af_irda.c net/irda/af_irda.c +4 -5

No files found.
--- a/net/irda/af_irda.c
+++ b/net/irda/af_irda.c
@@ -1891,11 +1891,10 @@ static int irda_setsockopt(struct socket *sock, int level, int optname,
 		case IAS_STRING:
 			/* Should check charset & co */
 			/* Check length */
-			if(ias_opt->attribute.irda_attrib_string.len >
+			/* The length is encoded in a __u8, and
-			   IAS_MAX_STRING) {
+			 * IAS_MAX_STRING == 256, so there is no way
-				kfree(ias_opt);
+			 * userspace can pass us a string too large.
-				return -EINVAL;
+			 * Jean II */
-			}
 			/* NULL terminate the string (avoid troubles) */
 			ias_opt->attribute.irda_attrib_string.string[ias_opt->attribute.irda_attrib_string.len] = '\0';
 			/* Add a string attribute */