From: Allan Stephens <allan.stephens@windriver.com>
Date: Mon, 26 Jun 2006 06:43:21 +0000 (-0700)
Subject: [TIPC]: Validate entire interface name when locating bearer to enable.
X-Git-Tag: v2.6.18-rc1~614^2~29
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=687a25f1cdfc6ee1f2f60f299dbd294908eb0d59;p=safe%2Fjmp%2Flinux-2.6

[TIPC]: Validate entire interface name when locating bearer to enable.

This fix prevents a bearer from being enabled using the wrong interface.
For example, specifying "eth:eth14" might enable "eth:eth1" by mistake.

Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Per Liden <per.liden@ericsson.com>
---

diff --git a/net/tipc/eth_media.c b/net/tipc/eth_media.c
index 3ecb100..682da4a 100644
--- a/net/tipc/eth_media.c
+++ b/net/tipc/eth_media.c
@@ -2,7 +2,7 @@
  * net/tipc/eth_media.c: Ethernet bearer support for TIPC
  * 
  * Copyright (c) 2001-2006, Ericsson AB
- * Copyright (c) 2005, Wind River Systems
+ * Copyright (c) 2005-2006, Wind River Systems
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -127,8 +127,7 @@ static int enable_bearer(struct tipc_bearer *tb_ptr)
 
 	/* Find device with specified name */
 
-	while (dev && dev->name &&
-	       (memcmp(dev->name, driver_name, strlen(dev->name)))) {
+	while (dev && dev->name && strncmp(dev->name, driver_name, IFNAMSIZ)) {	
 		dev = dev->next;
 	}
 	if (!dev)