GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-17 20:25:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

s390/dis: use explicit buf len

Browse source 
Pass buffer length in extra parameter.

Signed-off-by: Stefan Raspl <raspl@linux.vnet.ibm.com>
Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Stefan Raspl 2013-03-05 10:39:55 +01:00 • committed by Martin Schwidefsky
parent 08b4212456
commit 0bcc94baca
3 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
arch/s390/include/asm/processor.h
View file

@ -161,7 +161,8 @@ extern unsigned long thread_saved_pc(struct task_struct *t);
extern void show_code(struct pt_regs *regs); extern void show_code(struct pt_regs *regs);
extern void print_fn_code(unsigned char *code, unsigned long len); extern void print_fn_code(unsigned char *code, unsigned long len);
extern int insn_to_mnemonic(unsigned char *instruction, char buf[8]); extern int insn_to_mnemonic(unsigned char *instruction, char *buf,
unsigned int len);
unsigned long get_wchan(struct task_struct *p); unsigned long get_wchan(struct task_struct *p);
#define task_pt_regs(tsk) ((struct pt_regs *) \ #define task_pt_regs(tsk) ((struct pt_regs *) \

9
arch/s390/kernel/dis.c
View file

@ -1696,14 +1696,15 @@ static struct insn *find_insn(unsigned char *code)
* insn_to_mnemonic - decode an s390 instruction * insn_to_mnemonic - decode an s390 instruction
* @instruction: instruction to decode * @instruction: instruction to decode
* @buf: buffer to fill with mnemonic * @buf: buffer to fill with mnemonic
* @len: length of buffer
* *
* Decode the instruction at @instruction and store the corresponding * Decode the instruction at @instruction and store the corresponding
* mnemonic into @buf. * mnemonic into @buf of length @len.
* @buf is left unchanged if the instruction could not be decoded. * @buf is left unchanged if the instruction could not be decoded.
* Returns: * Returns:
* %0 on success, %-ENOENT if the instruction was not found. * %0 on success, %-ENOENT if the instruction was not found.
*/ */
int insn_to_mnemonic(unsigned char *instruction, char buf[8]) int insn_to_mnemonic(unsigned char *instruction, char *buf, unsigned int len)
{ {
struct insn *insn; struct insn *insn;
@ -1711,10 +1712,10 @@ int insn_to_mnemonic(unsigned char *instruction, char buf[8])
if (!insn) if (!insn)
return -ENOENT; return -ENOENT;
if (insn->name[0] == '\0') if (insn->name[0] == '\0')
snprintf(buf, 8, "%s", snprintf(buf, len, "%s",
long_insn_name[(int) insn->name[1]]); long_insn_name[(int) insn->name[1]]);
else else
snprintf(buf, 8, "%.5s", insn->name); snprintf(buf, len, "%.5s", insn->name);
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(insn_to_mnemonic); EXPORT_SYMBOL_GPL(insn_to_mnemonic);

2
arch/s390/kvm/trace.h
View file

@ -117,7 +117,7 @@ TRACE_EVENT(kvm_s390_intercept_instruction,
__entry->instruction, __entry->instruction,
insn_to_mnemonic((unsigned char *) insn_to_mnemonic((unsigned char *)
&__entry->instruction, &__entry->instruction,
__entry->insn) ? __entry->insn, sizeof(__entry->insn)) ?
"unknown" : __entry->insn) "unknown" : __entry->insn)
); );