Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754803Ab2KSUJF (ORCPT ); Mon, 19 Nov 2012 15:09:05 -0500 Received: from userp1040.oracle.com ([156.151.31.81]:17775 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754737Ab2KSUJE (ORCPT ); Mon, 19 Nov 2012 15:09:04 -0500 From: Sasha Levin To: lindner_marek@yahoo.de, siwu@hrz.tu-chemnitz.de, ordex@autistici.org Cc: davem@davemloft.net, b.a.t.m.a.n@lists.open-mesh.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Sasha Levin Subject: [PATCH] net, batman: don't crash on zero length strings in routing_algo Date: Mon, 19 Nov 2012 15:08:15 -0500 Message-Id: <1353355695-23252-1-git-send-email-sasha.levin@oracle.com> X-Mailer: git-send-email 1.8.0 X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3594 Lines: 66 The code that works with routing_algo assumes that the string passed is non empty, this assumption is wrong: sh-4.2# echo -ne '\0' > /sys/module/batman_adv/parameters/routing_algo [ 34.531340] BUG: unable to handle kernel paging request at ffff880015142fff [ 34.539191] IP: [] batadv_param_set_ra+0x3a/0x90 [ 34.541128] PGD 5027063 PUD 502b063 PMD 1bfc6067 PTE 15142160 [ 34.541128] Oops: 0000 [#1] PREEMPT SMP DEBUG_PAGEALLOC [ 34.541128] CPU 0 [ 34.541128] Pid: 6612, comm: sh Tainted: G W 3.7.0-rc6-sasha-00024-g33da443-dirty #157 [ 34.541128] RIP: 0010:[] [] batadv_param_set_ra+0x3a/0x90 [ 34.541128] RSP: 0018:ffff880014f81e48 EFLAGS: 00010292 [ 34.541128] RAX: 000000000000003b RBX: ffff880015143000 RCX: 0000000000000006 [ 34.550025] RDX: 0000000000000006 RSI: ffff8800151cb960 RDI: 0000000000000282 [ 34.550025] RBP: ffff880014f81e68 R08: 0000000000000003 R09: 0000000000000000 [ 34.550025] R10: 0000000000000000 R11: 0000000000000001 R12: ffff880015142fff [ 34.550025] R13: ffffffff84e6b390 R14: ffff880014f86a00 R15: ffffffff83c35170 [ 34.550025] FS: 00007f9ebc796700(0000) GS:ffff88001a600000(0000) knlGS:0000000000000000 [ 34.550025] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 34.550025] CR2: ffff880015142fff CR3: 000000001522f000 CR4: 00000000000406f0 [ 34.550025] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 34.550025] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 [ 34.550025] Process sh (pid: 6612, threadinfo ffff880014f80000, task ffff8800151cb000) [ 34.550025] Stack: [ 34.550025] ffff880014f81e68 ffff8800198ee020 0000000000000001 ffff880015143000 [ 34.550025] ffff880014f81e98 ffffffff81133776 ffff880014f81ea8 ffff880014f86a20 [ 34.550025] ffff880014f81f50 ffff880019d86d20 ffff880014f81ea8 ffffffff811335f8 [ 34.550025] Call Trace: [ 34.550025] [] param_attr_store+0x46/0x80 [ 34.550025] [] module_attr_store+0x18/0x40 [ 34.550025] [] sysfs_write_file+0x101/0x170 [ 34.550025] [] vfs_write+0xb8/0x180 [ 34.550025] [] sys_write+0x50/0xa0 [ 34.550025] [] tracesys+0xe1/0xe6 [ 34.550025] Code: 4c 89 65 f0 4c 89 6d f8 49 89 f5 e8 71 c5 0b fe 48 c7 c7 38 2e df 84 4c 8d 60 ff 48 89 c6 31 c0 4c 89 e2 49 01 dc e8 a6 d8 15 00 <41> 80 3c 24 0a 75 05 41 c6 04 24 00 48 89 df e8 62 ff ff ff 48 [ 34.550025] RIP [] batadv_param_set_ra+0x3a/0x90 [ 34.550025] RSP [ 34.550025] CR2: ffff880015142fff [ 34.550025] ---[ end trace 6c53b662c574774b ]--- Signed-off-by: Sasha Levin --- net/batman-adv/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index dc33a0c..3b8e368 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -426,7 +426,7 @@ static int batadv_param_set_ra(const char *val, const struct kernel_param *kp) char *algo_name = (char *)val; size_t name_len = strlen(algo_name); - if (algo_name[name_len - 1] == '\n') + if (name_len > 0 && algo_name[name_len - 1] == '\n') algo_name[name_len - 1] = '\0'; bat_algo_ops = batadv_algo_get(algo_name); -- 1.8.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/