Unverified Commit 9891f817 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9913 powerpc/pseries: Enforce hcall result buffer validity and size 

Merge Pull Request from: @ci-robot 
 
PR sync from: Huang Xiaojia <huangxiaojia2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/OV7OEQH5RFJF2UK2R5D3ZQKZDTS2VXST/ 
*** BLURB HERE ***

Nathan Lynch (1):
  powerpc/pseries: Enforce hcall result buffer validity and size


-- 
2.34.1
 
https://gitee.com/src-openeuler/kernel/issues/IACRHB 
 
Link:https://gitee.com/openeuler/kernel/pulls/9913

 

Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents fb28a00d 550acb21

arch/powerpc/include/asm/hvcall.h

+4 −4
Original line number Diff line number Diff line
@@ -453,7 +453,7 @@ long plpar_hcall_norets_notrace(unsigned long opcode, ...); 
 * Used for all but the craziest of phyp interfaces (see plpar_hcall9)

 */

#define PLPAR_HCALL_BUFSIZE 4

long plpar_hcall(unsigned long opcode, unsigned long *retbuf, ...);

long plpar_hcall(unsigned long opcode, unsigned long retbuf[static PLPAR_HCALL_BUFSIZE], ...);



/**

 * plpar_hcall_raw: - Make a hypervisor call without calculating hcall stats
@@ -467,7 +467,7 @@ long plpar_hcall(unsigned long opcode, unsigned long *retbuf, ...); 
 * plpar_hcall, but plpar_hcall_raw works in real mode and does not

 * calculate hypervisor call statistics.

 */

long plpar_hcall_raw(unsigned long opcode, unsigned long *retbuf, ...);

long plpar_hcall_raw(unsigned long opcode, unsigned long retbuf[static PLPAR_HCALL_BUFSIZE], ...);



/**

 * plpar_hcall9: - Make a pseries hypervisor call with up to 9 return arguments
@@ -478,8 +478,8 @@ long plpar_hcall_raw(unsigned long opcode, unsigned long *retbuf, ...); 
 * PLPAR_HCALL9_BUFSIZE to size the return argument buffer.

 */

#define PLPAR_HCALL9_BUFSIZE 9

long plpar_hcall9(unsigned long opcode, unsigned long *retbuf, ...);

long plpar_hcall9_raw(unsigned long opcode, unsigned long *retbuf, ...);

long plpar_hcall9(unsigned long opcode, unsigned long retbuf[static PLPAR_HCALL9_BUFSIZE], ...);

long plpar_hcall9_raw(unsigned long opcode, unsigned long retbuf[static PLPAR_HCALL9_BUFSIZE], ...);



struct hvcall_mpp_data {

	unsigned long entitled_mem;