From patchwork Tue Oct 5 16:34:48 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 66842 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 234D6B6EF7 for ; Wed, 6 Oct 2010 03:35:21 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752451Ab0JEQfN (ORCPT ); Tue, 5 Oct 2010 12:35:13 -0400 Received: from mail-wy0-f174.google.com ([74.125.82.174]:43992 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751872Ab0JEQfL (ORCPT ); Tue, 5 Oct 2010 12:35:11 -0400 Received: by wyb28 with SMTP id 28so6208023wyb.19 for ; Tue, 05 Oct 2010 09:35:09 -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=ODIjo5d1D3UQysW2UlDZbqrChHIs5zpIn9h3/lCIkW0=; b=FGkBj/z1tkqdbSPQ284BTwe6Nq/OnDDCFD78JKttKWWuDksdwiKIOKFhw77YK9GRln ozMTdwj7FeDnHhsKgPfjHWPZ1S4Va7kwnu4nkSRYDe9GV8/yuK8+lVRGXL+AYaxJsN5y QJlPsU4NNuF/ebHcl4Ws18iAuevoWp8ba3dRs= 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=H+Z87WCFVP6YfypX+gt87Cldj6zGeyT5ihsU3JhJ/d9360VICNgl/zUbmTMjjVbuSM 6fLwP0UKj7B4qd++Lz8aknvTfmlTSoqv2G6mYEsqC6DEJF75J2Va8EJNRX2+2jrY44ck tqZb9NjjlquQHnBHNdUXZBplXQkPLq9Oy0+oo= Received: by 10.227.141.136 with SMTP id m8mr9206999wbu.227.1286296509389; Tue, 05 Oct 2010 09:35:09 -0700 (PDT) Received: from bicker (h3f04.n1.ips.mtn.co.ug [41.210.191.4]) by mx.google.com with ESMTPS id g9sm5506317wbh.13.2010.10.05.09.34.56 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 05 Oct 2010 09:34:59 -0700 (PDT) Date: Tue, 5 Oct 2010 18:34:48 +0200 From: Dan Carpenter To: Karsten Keil Cc: netdev@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch] isdn: strcpy() => strlcpy() Message-ID: <20101005163448.GH5692@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 setup.phone and setup.eazmsn are 32 character buffers. rcvmsg.msg_data.byte_array is a 48 character buffer. sc_adapter[card]->channel[rcvmsg.phy_link_no - 1].dn is 50 chars. I changed the strcpy() so strlcpy() because that's safest. 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/sc/interrupt.c b/drivers/isdn/sc/interrupt.c index 485be8b..288073e 100644 --- a/drivers/isdn/sc/interrupt.c +++ b/drivers/isdn/sc/interrupt.c @@ -114,9 +114,11 @@ irqreturn_t interrupt_handler(int dummy, void *card_inst) { pr_debug("%s: Got Incoming Call\n", sc_adapter[card]->devicename); - strcpy(setup.phone,&(rcvmsg.msg_data.byte_array[4])); - strcpy(setup.eazmsn, - sc_adapter[card]->channel[rcvmsg.phy_link_no-1].dn); + strlcpy(setup.phone, &(rcvmsg.msg_data.byte_array[4]), + sizeof(setup.phone)); + strlcpy(setup.eazmsn, + sc_adapter[card]->channel[rcvmsg.phy_link_no - 1].dn, + sizeof(setup.eazmsn)); setup.si1 = 7; setup.si2 = 0; setup.plan = 0; @@ -176,7 +178,9 @@ irqreturn_t interrupt_handler(int dummy, void *card_inst) * Handle a GetMyNumber Rsp */ if (IS_CE_MESSAGE(rcvmsg,Call,0,GetMyNumber)){ - strcpy(sc_adapter[card]->channel[rcvmsg.phy_link_no-1].dn,rcvmsg.msg_data.byte_array); + strlcpy(sc_adapter[card]->channel[rcvmsg.phy_link_no - 1].dn, + rcvmsg.msg_data.byte_array, + sizeof(rcvmsg.msg_data.byte_array)); continue; }