From patchwork Thu Jul 26 14:26:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Vorontsov X-Patchwork-Id: 10275 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 885C123E57 for ; Thu, 26 Jul 2012 14:29:06 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id 58214A18F39 for ; Thu, 26 Jul 2012 14:29:06 +0000 (UTC) Received: by mail-yx0-f180.google.com with SMTP id q6so2019999yen.11 for ; Thu, 26 Jul 2012 07:29:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=Rr/lkm1pBDoDltL0b7fPcmk+1ekGAJEEtHe+LAHFvq4=; b=ORydhkfVbSW0MLJg5pz3GriDDmVf+DRmGrTdjNQJXfQ3EE954PHyAepIo7XUvoa6zG ij6HzvzgXuMFR+dvVUxLrWItaGrVaQmJNsfbHYnrv4zXL7kfV7FyypHinmo+QgAEQMzN XCYvz8LC44skTujNcYAyYnkU8hz++QhFEo6eu+nq2xN58QENVWJZDjY3VX15531f5CTh 4LMKwV8DIRsQveyrk6SAihxlGQ6OGqmE0f2mHvBCjW7AVKAP5j7/59U79Nb1GQ5+iISQ rTHdk+6p6agjqIc1DDECoAfWycWBcfMBE/hOnAmdF2b0aX8bts3s1Vp7ob9LDER4wPdw RjGQ== Received: by 10.50.209.73 with SMTP id mk9mr1776707igc.66.1343312945673; Thu, 26 Jul 2012 07:29:05 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.43.93.3 with SMTP id bs3csp142677icc; Thu, 26 Jul 2012 07:29:05 -0700 (PDT) Received: by 10.236.183.198 with SMTP id q46mr27459086yhm.107.1343312939915; Thu, 26 Jul 2012 07:28:59 -0700 (PDT) Received: from mail-gh0-f178.google.com (mail-gh0-f178.google.com [209.85.160.178]) by mx.google.com with ESMTPS id k67si21287619yhj.110.2012.07.26.07.28.59 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 26 Jul 2012 07:28:59 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.160.178 is neither permitted nor denied by best guess record for domain of anton.vorontsov@linaro.org) client-ip=209.85.160.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.160.178 is neither permitted nor denied by best guess record for domain of anton.vorontsov@linaro.org) smtp.mail=anton.vorontsov@linaro.org Received: by ghbf1 with SMTP id f1so2378836ghb.37 for ; Thu, 26 Jul 2012 07:28:59 -0700 (PDT) Received: by 10.66.78.196 with SMTP id d4mr20942821pax.76.1343312939156; Thu, 26 Jul 2012 07:28:59 -0700 (PDT) Received: from localhost (c-71-204-165-222.hsd1.ca.comcast.net. [71.204.165.222]) by mx.google.com with ESMTPS id ot4sm16639525pbb.65.2012.07.26.07.28.57 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 26 Jul 2012 07:28:58 -0700 (PDT) From: Anton Vorontsov To: Jason Wessel Cc: Andrew Morton , Steven Rostedt , John Stultz , arve@android.com, linux-kernel@vger.kernel.org, linaro-kernel@lists.linaro.org, patches@linaro.org, kernel-team@android.com, kgdb-bugreport@lists.sourceforge.net Subject: [PATCH 7/7] kdb: Add kiosk mode Date: Thu, 26 Jul 2012 07:26:31 -0700 Message-Id: <1343312791-9138-7-git-send-email-anton.vorontsov@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <20120726142514.GA32158@lizard> References: <20120726142514.GA32158@lizard> X-Gm-Message-State: ALoCoQmtBRMZmehR3JkZYo4dIKuHhwQF4uWOiqumgcBEumI2lA/rSA68YDZ5+ol2Civqk5CqPdWX By issuing 'echo 1 > /sys/module/kdb/parameters/kiosk' or booting with kdb.kiosk=1 kernel command line option, one can still have a somewhat usable debugging facility, but not fearing that the debugger can be used to easily gain root access or dump sensitive data. Without the kiosk mode, obtaining the root rights via KDB is a matter of a few commands, and works everywhere. For example, log in as a normal user: cbou:~$ id uid=1001(cbou) gid=1001(cbou) groups=1001(cbou) Now enter KDB (for example via sysrq): Entering kdb (current=0xffff8800065bc740, pid 920) due to Keyboard Entry kdb> ps 23 sleeping system daemon (state M) processes suppressed, use 'ps A' to see all. Task Addr Pid Parent [*] cpu State Thread Command 0xffff8800065bc740 920 919 1 0 R 0xffff8800065bca20 *bash 0xffff880007078000 1 0 0 0 S 0xffff8800070782e0 init [...snip...] 0xffff8800065be3c0 918 1 0 0 S 0xffff8800065be6a0 getty 0xffff8800065b9c80 919 1 0 0 S 0xffff8800065b9f60 login 0xffff8800065bc740 920 919 1 0 R 0xffff8800065bca20 *bash All we need is the offset of cred pointers. We can look up the offset in the distro's kernel source, but it is unnecessary. We can just start dumping init's task_struct, until we see the process name: kdb> md 0xffff880007078000 0xffff880007078000 0000000000000001 ffff88000703c000 ................ 0xffff880007078010 0040210000000002 0000000000000000 .....!@......... [...snip...] 0xffff8800070782b0 ffff8800073e0580 ffff8800073e0580 ..>.......>..... 0xffff8800070782c0 0000000074696e69 0000000000000000 init............ ^ Here, 'init'. Creds are just above it, so the offset is 0x02b0. Now we set up init's creds for our non-privileged shell: kdb> mm 0xffff8800065bc740+0x02b0 0xffff8800073e0580 0xffff8800065bc9f0 = 0xffff8800073e0580 kdb> mm 0xffff8800065bc740+0x02b8 0xffff8800073e0580 0xffff8800065bc9f8 = 0xffff8800073e0580 And thus gaining the root: kdb> go cbou:~$ id uid=0(root) gid=0(root) groups=0(root) cbou:~$ bash root:~# p.s. No distro enables kdb by default (although, with a nice KDB-over-KMS feature availability, I would expect at least some would enable it), so it's not actually some kind of a major issue. Signed-off-by: Anton Vorontsov --- include/linux/kdb.h | 1 + kernel/debug/kdb/kdb_main.c | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/include/linux/kdb.h b/include/linux/kdb.h index 36f6d09..8dad355 100644 --- a/include/linux/kdb.h +++ b/include/linux/kdb.h @@ -63,6 +63,7 @@ typedef int (*kdb_func_t)(int, const char **); #define KDB_BADLENGTH (-19) #define KDB_NOBP (-20) #define KDB_BADADDR (-21) +#define KDB_NOPERM (-22) /* * kdb_diemsg diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c index 1bb18e6..82973b6 100644 --- a/kernel/debug/kdb/kdb_main.c +++ b/kernel/debug/kdb/kdb_main.c @@ -12,6 +12,7 @@ */ #include +#include #include #include #include @@ -21,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -40,6 +42,12 @@ #include #include "kdb_private.h" +#undef MODULE_PARAM_PREFIX +#define MODULE_PARAM_PREFIX "kdb." + +static bool kdb_kiosk; +module_param_named(kiosk, kdb_kiosk, bool, 0600); + #define GREP_LEN 256 char kdb_grep_string[GREP_LEN]; int kdb_grepping_flag; @@ -119,6 +127,7 @@ static kdbmsg_t kdbmsgs[] = { KDBMSG(BADLENGTH, "Invalid length field"), KDBMSG(NOBP, "No Breakpoint exists"), KDBMSG(BADADDR, "Invalid address"), + KDBMSG(NOPERM, "Permission denied"), }; #undef KDBMSG @@ -986,6 +995,14 @@ int kdb_parse(const char *cmdstr) if (i < kdb_max_commands) { int result; + + if (kdb_kiosk) { + if (!(tp->cmd_flags & (KDB_SAFE | KDB_SAFE_NO_ARGS))) + return KDB_NOPERM; + if (tp->cmd_flags & KDB_SAFE_NO_ARGS && argc > 1) + return KDB_NOPERM; + } + KDB_STATE_SET(CMD); result = (*tp->cmd_func)(argc-1, (const char **)argv); if (result && ignore_errors && result > KDB_CMD_GO) @@ -1008,7 +1025,7 @@ int kdb_parse(const char *cmdstr) * obtaining the address of a variable, or the nearest symbol * to an address contained in a register. */ - { + if (!kdb_kiosk) { unsigned long value; char *name = NULL; long offset; @@ -1024,6 +1041,7 @@ int kdb_parse(const char *cmdstr) kdb_printf("\n"); return 0; } + return KDB_NOPERM; }