From patchwork Sat Jul 10 14:31:11 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 58485 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id A3398B6F0C for ; Sun, 11 Jul 2010 00:32:54 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752720Ab0GJOcp (ORCPT ); Sat, 10 Jul 2010 10:32:45 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:38548 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751002Ab0GJOco (ORCPT ); Sat, 10 Jul 2010 10:32:44 -0400 Received: by fxm14 with SMTP id 14so1619473fxm.19 for ; Sat, 10 Jul 2010 07:32:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:mime-version:content-type:content-disposition:user-agent; bh=tbLVj35AG4a7yM3dUXnghDK451tjokCAp/9THDCKMvw=; b=NLDk3jpISxtFVJpGIiEG6fF/y+ivUYbM7RnY7T3fNYyu3PlQhxlKZB5z4td8QpOqV2 OQaA/Sr9kT2MWvRcggxGG+JefdRrqaDrLjWpc3dpWRcDhmcC6zUhxpMkBC0c0WQOgvOZ WBud/YNZRx1QCtUXWKkNt3mAZAqXAsqFr9V+s= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=jJmbdb76RUau5s76T2fR/skaDozuZfsi1rDnoEFngqYk7fmTvoAzMvah4Bo0Hd0l8l pmPQq4PaqvvKOQQ/AHr6p0Dwtd1G2++Ipr7gKj/eB2AFOSBqz6GYMrPADLDWxFHMvd94 Po4lvLec/hWgcpAXKkyadwsAPM28Buwb+1YS8= Received: by 10.223.110.73 with SMTP id m9mr9522374fap.39.1278772363185; Sat, 10 Jul 2010 07:32:43 -0700 (PDT) Received: from bicker ([205.177.176.130]) by mx.google.com with ESMTPS id q24sm4417212faa.42.2010.07.10.07.32.33 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 10 Jul 2010 07:32:42 -0700 (PDT) Date: Sat, 10 Jul 2010 16:31:11 +0200 From: Dan Carpenter To: Karsten Keil Cc: Stephen Hemminger , "David S. Miller" , Dirk Hohndel , Jiri Kosina , netdev@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch] isdn: fix strlen() usage Message-ID: <20100710143111.GA19184@bicker> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org There was a missing "else" statement so the original code overflowed if ->master->name was too long. Also the ->slave and ->master buffers can hold names with 9 characters and a NULL so I cleaned it up to allow another character. Signed-off-by: Dan Carpenter --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c index 8c85d1e..26d44c3 100644 --- a/drivers/isdn/i4l/isdn_net.c +++ b/drivers/isdn/i4l/isdn_net.c @@ -2924,16 +2924,17 @@ isdn_net_getcfg(isdn_net_ioctl_cfg * cfg) cfg->dialtimeout = lp->dialtimeout >= 0 ? lp->dialtimeout / HZ : -1; cfg->dialwait = lp->dialwait / HZ; if (lp->slave) { - if (strlen(lp->slave->name) > 8) + if (strlen(lp->slave->name) >= 10) strcpy(cfg->slave, "too-long"); else strcpy(cfg->slave, lp->slave->name); } else cfg->slave[0] = '\0'; if (lp->master) { - if (strlen(lp->master->name) > 8) + if (strlen(lp->master->name) >= 10) strcpy(cfg->master, "too-long"); - strcpy(cfg->master, lp->master->name); + else + strcpy(cfg->master, lp->master->name); } else cfg->master[0] = '\0'; return 0;