hulk inclusion category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9W3QR CVE: CVE-2022-48666
--------------------------------
Patch 2057a48d0dd0 ("sunrpc: add a struct rpc_stats arg to rpc_create_args"), the mainline fix for CVE-2022-48666,
Fix this by changing the kabi to use a reserved field.
Fixes: 71e2c70eb384 ("[Backport] sunrpc: add a struct rpc_stats arg to rpc_create_args") Signed-off-by: Wang Zhaolong wangzhaolong1@huawei.com --- include/linux/sunrpc/clnt.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h index 4648ae3f5bd2..28a7812e984e 100644 --- a/include/linux/sunrpc/clnt.h +++ b/include/linux/sunrpc/clnt.h @@ -134,7 +134,6 @@ struct rpc_create_args { const char *servername; const char *nodename; const struct rpc_program *program; - struct rpc_stat *stats; u32 prognumber; /* overrides program->number */ u32 version; rpc_authflavor_t authflavor; @@ -144,7 +143,7 @@ struct rpc_create_args { struct svc_xprt *bc_xprt; /* NFSv4.1 backchannel */ const struct cred *cred;
- KABI_RESERVE(1) + KABI_USE(1, struct rpc_stat *stats) };
struct rpc_add_xprt_test {