projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'nfs-rdma-for-4.0-3' of git://git.linux-nfs.org/projects/anna/nfs-rdma
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
debug
/
kdb
/
kdb_main.c
diff --git
a/kernel/debug/kdb/kdb_main.c
b/kernel/debug/kdb/kdb_main.c
index 420418360b81a6248f798d7570720d70e1c6f881..4121345498e0e48f10b414a4b12e0b5f15daeabd 100644
(file)
--- a/
kernel/debug/kdb/kdb_main.c
+++ b/
kernel/debug/kdb/kdb_main.c
@@
-50,8
+50,7
@@
static int kdb_cmd_enabled = CONFIG_KDB_DEFAULT_ENABLE;
module_param_named(cmd_enable, kdb_cmd_enabled, int, 0600);
static int kdb_cmd_enabled = CONFIG_KDB_DEFAULT_ENABLE;
module_param_named(cmd_enable, kdb_cmd_enabled, int, 0600);
-#define GREP_LEN 256
-char kdb_grep_string[GREP_LEN];
+char kdb_grep_string[KDB_GREP_STRLEN];
int kdb_grepping_flag;
EXPORT_SYMBOL(kdb_grepping_flag);
int kdb_grep_leading;
int kdb_grepping_flag;
EXPORT_SYMBOL(kdb_grepping_flag);
int kdb_grep_leading;
@@
-870,7
+869,7
@@
static void parse_grep(const char *str)
len = strlen(cp);
if (!len)
return;
len = strlen(cp);
if (!len)
return;
- if (len >=
GREP_
LEN) {
+ if (len >=
KDB_GREP_STR
LEN) {
kdb_printf("search string too long\n");
return;
}
kdb_printf("search string too long\n");
return;
}
@@
-1280,6
+1279,8
@@
static int kdb_local(kdb_reason_t reason, int error, struct pt_regs *regs,
kdb_nextline = 1;
KDB_STATE_CLEAR(SUPPRESS);
kdb_grepping_flag = 0;
kdb_nextline = 1;
KDB_STATE_CLEAR(SUPPRESS);
kdb_grepping_flag = 0;
+ /* ensure the old search does not leak into '/' commands */
+ kdb_grep_string[0] = '\0';
cmdbuf = cmd_cur;
*cmdbuf = '\0';
cmdbuf = cmd_cur;
*cmdbuf = '\0';