From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-ww0-f44.google.com ([74.125.82.44]:54352 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754841Ab0JILyY (ORCPT ); Sat, 9 Oct 2010 07:54:24 -0400 Date: Sat, 9 Oct 2010 13:54:06 +0200 From: Dan Carpenter To: Brett Rudley Cc: Henry Ptasinski , Nohee Ko , Greg Kroah-Hartman , Jason Cooper , Grant Grundler , linux-wireless@vger.kernel.org, devel@driverdev.osuosl.org, kernel-janitors@vger.kernel.org Subject: [patch] Staging: brcm80211: make interface name buffer smaller Message-ID: <20101009115406.GR11681@bicker> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Sender: linux-wireless-owner@vger.kernel.org List-ID: In the original code the interface name was IFNAMSIZ + 1, but that caused problems in dhd_ifname2idx() which does: strncmp(dhd->iflist[i]->name, name, IFNAMSIZ) The wl_event_msg_t struct can only store 16 character names as well. And thirdly there is a potential buffer overflow in dhd_op_if() because if->net->name is IFNAMSIZ and we do: strcpy(ifp->net->name, ifp->name); Signed-off-by: Dan Carpenter diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c index 72eed5b..d513069 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c @@ -217,7 +217,7 @@ typedef struct dhd_if { u8 mac_addr[ETHER_ADDR_LEN]; /* assigned MAC address */ bool attached; /* Delayed attachment when unset */ bool txflowcontrol; /* Per interface flow control indicator */ - char name[IFNAMSIZ + 1]; /* linux interface name */ + char name[IFNAMSIZ]; /* linux interface name */ } dhd_if_t; /* Local private structure (extension of pub) */ @@ -1871,8 +1871,7 @@ dhd_add_if(dhd_info_t *dhd, int ifidx, void *handle, char *name, memset(ifp, 0, sizeof(dhd_if_t)); ifp->info = dhd; dhd->iflist[ifidx] = ifp; - strncpy(ifp->name, name, IFNAMSIZ); - ifp->name[IFNAMSIZ] = '\0'; + strlcpy(ifp->name, name, IFNAMSIZ); if (mac_addr != NULL) memcpy(&ifp->mac_addr, mac_addr, ETHER_ADDR_LEN);