From: Fengguang Wu <fengguang.wu@intel.com>
To: David Miller <davem@davemloft.net>
Cc: devel@driverdev.osuosl.org, isdn@linux-pingi.de,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
gregkh@linuxfoundation.org, joe@perches.com,
dan.carpenter@oracle.com
Subject: [PATCH v2] isdnloop: fix and simplify isdnloop_init()
Date: Fri, 3 Aug 2012 15:32:40 +0800 [thread overview]
Message-ID: <20120803073240.GA12723@localhost> (raw)
In-Reply-To: <20120802.162156.1853851468137303302.davem@davemloft.net>
On Thu, Aug 02, 2012 at 04:21:56PM -0700, David Miller wrote:
> From: Fengguang Wu <fengguang.wu@intel.com>
> Date: Thu, 2 Aug 2012 19:05:43 +0800
>
> > 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] [<ffffffff832448c3>] ? CallcNew+0x56/0x56
> > [ 22.815248] [<ffffffff8222b623>] panic+0x110/0x329
> > [ 22.914330] [<ffffffff83244972>] ? isdnloop_init+0xaf/0xb1
> > [ 23.014800] [<ffffffff832448c3>] ? CallcNew+0x56/0x56
> > [ 23.090763] [<ffffffff8108e24b>] __stack_chk_fail+0x2b/0x30
> > [ 23.185748] [<ffffffff83244972>] isdnloop_init+0xaf/0xb1
> >
> > Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
>
> The reason the "$Revision ..." prefix is there is so that automated
> version control tools will change the string automatically when code
> is committed in CVS.
>
> In the GIT era this revision style is obsolete.
>
> Therefore you might as well just delete this crap altogether.
OK. The below updated version will simply print the hard coded
revision number as it's unlikely to change any more.
Thanks,
Fengguang
---
isdnloop: fix and simplify isdnloop_init
Fix a buffer overflow bug by hard coding the revision number.
[ 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] [<ffffffff832448c3>] ? CallcNew+0x56/0x56
[ 22.815248] [<ffffffff8222b623>] panic+0x110/0x329
[ 22.914330] [<ffffffff83244972>] ? isdnloop_init+0xaf/0xb1
[ 23.014800] [<ffffffff832448c3>] ? CallcNew+0x56/0x56
[ 23.090763] [<ffffffff8108e24b>] __stack_chk_fail+0x2b/0x30
[ 23.185748] [<ffffffff83244972>] isdnloop_init+0xaf/0xb1
Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
---
drivers/isdn/isdnloop/isdnloop.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
--- linux.orig/drivers/isdn/isdnloop/isdnloop.c 2012-08-03 15:24:49.047544323 +0800
+++ linux/drivers/isdn/isdnloop/isdnloop.c 2012-08-03 15:27:39.503548375 +0800
@@ -16,7 +16,6 @@
#include <linux/sched.h>
#include "isdnloop.h"
-static char *revision = "$Revision: 1.11.6.7 $";
static char *isdnloop_id = "loop0";
MODULE_DESCRIPTION("ISDN4Linux: Pseudo Driver that simulates an ISDN card");
@@ -1494,16 +1493,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 1.11.6.7\n");
if (isdnloop_id)
return (isdnloop_addcard(isdnloop_id));
next prev parent reply other threads:[~2012-08-03 7:32 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-02 11:05 [PATCH] isdnloop: fix and simplify isdnloop_init() Fengguang Wu
2012-08-02 23:21 ` David Miller
2012-08-03 7:32 ` Fengguang Wu [this message]
2012-08-03 8:47 ` [PATCH v2] " Karsten Keil
2012-08-03 8:51 ` David Miller
2012-08-03 9:10 ` [PATCH v3] " Fengguang Wu
2012-08-03 23:53 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120803073240.GA12723@localhost \
--to=fengguang.wu@intel.com \
--cc=dan.carpenter@oracle.com \
--cc=davem@davemloft.net \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=isdn@linux-pingi.de \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).