From patchwork Thu Aug 2 11:05:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: kbuild test robot X-Patchwork-Id: 174732 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 5EA652C008B for ; Thu, 2 Aug 2012 21:06:06 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754675Ab2HBLFr (ORCPT ); Thu, 2 Aug 2012 07:05:47 -0400 Received: from mga11.intel.com ([192.55.52.93]:18240 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754603Ab2HBLFq (ORCPT ); Thu, 2 Aug 2012 07:05:46 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 02 Aug 2012 04:05:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.71,315,1320652800"; d="scan'208";a="192420010" Received: from wfg-t420.sh.intel.com ([10.239.198.133]) by fmsmga001.fm.intel.com with ESMTP; 02 Aug 2012 04:05:44 -0700 Received: from wfg by wfg-t420.sh.intel.com with local (Exim 4.77) (envelope-from ) id 1SwtDr-0005fn-Q0; Thu, 02 Aug 2012 19:05:43 +0800 Date: Thu, 2 Aug 2012 19:05:43 +0800 From: Fengguang Wu To: "open list:ISDN SUBSYSTEM" Cc: Dan Carpenter , Greg KH , "devel@driverdev.osuosl.org" , Joe Perches , Karsten Keil , LKML Subject: [PATCH] isdnloop: fix and simplify isdnloop_init() Message-ID: <20120802110543.GA21745@localhost> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix a buffer overflow bug by removing the revision transform code. [ 22.016214] isdnloop-ISDN-driver Rev 1.11.6.7 [ 22.097508] isdnloop: (loop0) virtual card added [ 22.174400] Kernel panic - not syncing: stack-protector: Kernel stack is corrupted in: ffffffff83244972 [ 22.174400] [ 22.436157] Pid: 1, comm: swapper Not tainted 3.5.0-bisect-00018-gfa8bbb1-dirty #129 [ 22.624071] Call Trace: [ 22.720558] [] ? CallcNew+0x56/0x56 [ 22.815248] [] panic+0x110/0x329 [ 22.914330] [] ? isdnloop_init+0xaf/0xb1 [ 23.014800] [] ? CallcNew+0x56/0x56 [ 23.090763] [] __stack_chk_fail+0x2b/0x30 [ 23.185748] [] isdnloop_init+0xaf/0xb1 Signed-off-by: Fengguang Wu --- drivers/isdn/isdnloop/isdnloop.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) -- 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 --- linux.orig/drivers/isdn/isdnloop/isdnloop.c 2012-05-24 19:03:06.748430938 +0800 +++ linux/drivers/isdn/isdnloop/isdnloop.c 2012-08-02 11:57:16.806437909 +0800 @@ -16,7 +16,7 @@ #include #include "isdnloop.h" -static char *revision = "$Revision: 1.11.6.7 $"; +static char *revision = "1.11.6.7"; static char *isdnloop_id = "loop0"; MODULE_DESCRIPTION("ISDN4Linux: Pseudo Driver that simulates an ISDN card"); @@ -1494,16 +1494,7 @@ isdnloop_addcard(char *id1) static int __init isdnloop_init(void) { - char *p; - char rev[10]; - - if ((p = strchr(revision, ':'))) { - strcpy(rev, p + 1); - p = strchr(rev, '$'); - *p = 0; - } else - strcpy(rev, " ??? "); - printk(KERN_NOTICE "isdnloop-ISDN-driver Rev%s\n", rev); + printk(KERN_NOTICE "isdnloop-ISDN-driver Rev %s\n", revision); if (isdnloop_id) return (isdnloop_addcard(isdnloop_id));