Skip to contentSkip to conversation

bcm43xx: iw_priv_args names should be <16 characters

PATCH In review Erik Mouw 3 participants 4 messages Apr 13, 2006 – Apr 14, 2006

Subsystems (3)
lore
Share & tools
lore

Erik Mouw

author
#0 lore raw

PATCH 1/1 bcm43xx: iw_priv_args names should be <16 characters

The room for the names in bcm43xx_priv_wx_args[] are IFNAMSIZ long and IFNAMSIZ is defined as 16, so the names in bcm43xx_priv_wx_args should be 15 characters (16 including the trailing \0). This patch fixes that for the "set_shortpreambl", "get_shortpreambl", "set_swencryption", and "get_swencryption" private calls. Patch is against 2.6.17-rc1.

drivers/net/wireless/bcm43xx/bcm43xx_wx.c +4 -4
index 3daee82..3edbb48 100644
@@ -962,22 +962,22 @@ static const struct iw_priv_args bcm43xx
 	{
 		.cmd		= PRIV_WX_SET_SHORTPREAMBLE,
 		.set_args	= IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-		.name		= "set_shortpreambl",
+		.name		= "set_shortpreamb",
 	},
 	{
 		.cmd		= PRIV_WX_GET_SHORTPREAMBLE,
 		.get_args	= IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING,
-		.name		= "get_shortpreambl",
+		.name		= "get_shortpreamb",
 	},
 	{
 		.cmd		= PRIV_WX_SET_SWENCRYPTION,
 		.set_args	= IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-		.name		= "set_swencryption",
+		.name		= "set_swencrypt",
 	},
 	{
 		.cmd		= PRIV_WX_GET_SWENCRYPTION,
 		.get_args	= IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING,
-		.name		= "get_swencryption",
+		.name		= "get_swencrypt",
 	},
 	{
 		.cmd		= PRIV_WX_SPROM_WRITE,
#1 lore raw
Quoted 7 lines · On Thu, 13 Apr 2006 15:02:27 +0200 Erik Mouw <[email protected]> wrote:

The room for the names in bcm43xx_priv_wx_args[] are IFNAMSIZ long and IFNAMSIZ is defined as 16, so the names in bcm43xx_priv_wx_args should be 15 characters (16 including the trailing \0). This patch fixes that for the "set_shortpreambl", "get_shortpreambl", "set_swencryption", and "get_swencryption" private calls. Patch is against 2.6.17-rc1.

Shouldn't compiler have gagged on this?

author
#2 lore raw
Quoted 9 lines · Stephen Hemminger
Quoted 6 lines · On Thu, 13 Apr 2006 15:02:27 +0200 Erik Mouw <[email protected]> wrote:

The room for the names in bcm43xx_priv_wx_args[] are IFNAMSIZ long and IFNAMSIZ is defined as 16, so the names in bcm43xx_priv_wx_args should be 15 characters (16 including the trailing \0). This patch fixes that for the "set_shortpreambl", "get_shortpreambl", "set_swencryption", and "get_swencryption" private calls. Patch is against 2.6.17-rc1.

Quoted 3 lines
Quoted 1 line

Shouldn't compiler have gagged on this?

Apparently not. At least the compiler I use doesn't warn about it (gcc version 3.3.5 (Debian 1:3.3.5-13)).

Linus, this might be be something for sparse to check:

  struct mystruct {
	char name[16];

};

  mystruct ms = { .name = "muchlongerthan16characters" };

Erik

Signature · 2 lines
+-- Erik Mouw -- www.harddisk-recovery.com -- +31 70 370 12 90 --
| Lab address: Delftechpark 26, 2628 XH, Delft, The Netherlands
#3 lore raw
Quoted 6 lines · Erik Mouw
Quoted 1 line · Stephen Hemminger

Shouldn't compiler have gagged on this?

Apparently not. At least the compiler I use doesn't warn about it (gcc version 3.3.5 (Debian 1:3.3.5-13)).

Quoted 7 lines

Linus, this might be be something for sparse to check:

  struct mystruct {
	char name[16];

};

  mystruct ms = { .name = "muchlongerthan16characters" };

If you actually try that example you'd see that gcc (even really old versions) will warn you about that code.

What gcc WON'T warn about is if everything but the final '\0' fits in the array.

So the code:

	struct mystruct { char name[16]; };
	struct mystruct exact_length = { .name = "0123456789abcdef" };
	struct mystruct one_too_long = { .name = "0123456789abcdefg" };

Produces:
a.c:3: warning: initializer-string for array of chars is too long a.c:3: warning: (near initialization for 'one_too_long.name')

I believe this is intentional and in line with the C specs. It's also useful since it allows you to define macros like:

	#define DECLARE_NON_TERMINATED_STRING(name, val) \
			const name[sizeof(val "") - 1] = val;

Making sparse a bit stricter than gcc in this case might not be a bad idea, though.

-Mitch