x86/insn: Rename insn_decode() to insn_decode_from_regs()
commit 9e761296c52dcdb1aaa151b65bd39accb05740d9 upstream. Rename insn_decode() to insn_decode_from_regs() to denote that it receives regs as param and uses registers from there during decoding. Free the former name for a more generic version of the function. No functional changes. Signed-off-by: Borislav Petkov <bp@suse.de> Link: https://lkml.kernel.org/r/20210304174237.31945-2-bp@alien8.de Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
fd80da64cf
commit
a3d96c7439
@@ -26,7 +26,7 @@ int insn_fetch_from_user(struct pt_regs *regs,
|
|||||||
unsigned char buf[MAX_INSN_SIZE]);
|
unsigned char buf[MAX_INSN_SIZE]);
|
||||||
int insn_fetch_from_user_inatomic(struct pt_regs *regs,
|
int insn_fetch_from_user_inatomic(struct pt_regs *regs,
|
||||||
unsigned char buf[MAX_INSN_SIZE]);
|
unsigned char buf[MAX_INSN_SIZE]);
|
||||||
bool insn_decode(struct insn *insn, struct pt_regs *regs,
|
bool insn_decode_from_regs(struct insn *insn, struct pt_regs *regs,
|
||||||
unsigned char buf[MAX_INSN_SIZE], int buf_size);
|
unsigned char buf[MAX_INSN_SIZE], int buf_size);
|
||||||
|
|
||||||
#endif /* _ASM_X86_INSN_EVAL_H */
|
#endif /* _ASM_X86_INSN_EVAL_H */
|
||||||
|
@@ -236,7 +236,7 @@ static enum es_result vc_decode_insn(struct es_em_ctxt *ctxt)
|
|||||||
return ES_EXCEPTION;
|
return ES_EXCEPTION;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!insn_decode(&ctxt->insn, ctxt->regs, buffer, res))
|
if (!insn_decode_from_regs(&ctxt->insn, ctxt->regs, buffer, res))
|
||||||
return ES_DECODE_FAILED;
|
return ES_DECODE_FAILED;
|
||||||
} else {
|
} else {
|
||||||
res = vc_fetch_insn_kernel(ctxt, buffer);
|
res = vc_fetch_insn_kernel(ctxt, buffer);
|
||||||
|
@@ -356,7 +356,7 @@ bool fixup_umip_exception(struct pt_regs *regs)
|
|||||||
if (!nr_copied)
|
if (!nr_copied)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if (!insn_decode(&insn, regs, buf, nr_copied))
|
if (!insn_decode_from_regs(&insn, regs, buf, nr_copied))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
umip_inst = identify_insn(&insn);
|
umip_inst = identify_insn(&insn);
|
||||||
|
@@ -1492,7 +1492,7 @@ int insn_fetch_from_user_inatomic(struct pt_regs *regs, unsigned char buf[MAX_IN
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* insn_decode() - Decode an instruction
|
* insn_decode_from_regs() - Decode an instruction
|
||||||
* @insn: Structure to store decoded instruction
|
* @insn: Structure to store decoded instruction
|
||||||
* @regs: Structure with register values as seen when entering kernel mode
|
* @regs: Structure with register values as seen when entering kernel mode
|
||||||
* @buf: Buffer containing the instruction bytes
|
* @buf: Buffer containing the instruction bytes
|
||||||
@@ -1505,7 +1505,7 @@ int insn_fetch_from_user_inatomic(struct pt_regs *regs, unsigned char buf[MAX_IN
|
|||||||
*
|
*
|
||||||
* True if instruction was decoded, False otherwise.
|
* True if instruction was decoded, False otherwise.
|
||||||
*/
|
*/
|
||||||
bool insn_decode(struct insn *insn, struct pt_regs *regs,
|
bool insn_decode_from_regs(struct insn *insn, struct pt_regs *regs,
|
||||||
unsigned char buf[MAX_INSN_SIZE], int buf_size)
|
unsigned char buf[MAX_INSN_SIZE], int buf_size)
|
||||||
{
|
{
|
||||||
int seg_defs;
|
int seg_defs;
|
||||||
|
Reference in New Issue
Block a user