From 305bd3d8c82c4ecf67a8d53f43ae69e9cb5568e7 Mon Sep 17 00:00:00 2001 From: Oleg Drokin Date: Sun, 3 Jan 2016 18:58:56 -0500 Subject: [PATCH] LU-7623 gss: Update upcall structure with user attributes This helps to better track userspace pointers and keeps sparse happy. Also fix gss_do_ctx_init_rpc definition and sync up the forward declaration Signed-off-by: Oleg Drokin Change-Id: I10c1a7dd58531886bf8cfa8c684ea6fba321c511 Reviewed-on: http://review.whamcloud.com/17790 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: John L. Hammond Reviewed-by: Jeremy Filizetti Reviewed-by: Sebastien Buisson Reviewed-by: Frank Zago --- lustre/ptlrpc/gss/gss_cli_upcall.c | 8 ++++---- lustre/ptlrpc/gss/gss_internal.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lustre/ptlrpc/gss/gss_cli_upcall.c b/lustre/ptlrpc/gss/gss_cli_upcall.c index 4c6a33f..67e7480 100644 --- a/lustre/ptlrpc/gss/gss_cli_upcall.c +++ b/lustre/ptlrpc/gss/gss_cli_upcall.c @@ -218,19 +218,19 @@ int ctx_init_parse_reply(struct lustre_msg *msg, int swabbed, struct lgssd_ioctl_param { int version; /* in */ int secid; /* in */ - char *uuid; /* in */ + char __user *uuid; /* in */ int lustre_svc; /* in */ uid_t uid; /* in */ gid_t gid; /* in */ long send_token_size;/* in */ - char *send_token; /* in */ + char __user *send_token; /* in */ long reply_buf_size; /* in */ - char *reply_buf; /* in */ + char __user *reply_buf; /* in */ long status; /* out */ long reply_length; /* out */ }; -int gss_do_ctx_init_rpc(__user char *buffer, unsigned long count) +int gss_do_ctx_init_rpc(char __user *buffer, unsigned long count) { struct obd_import *imp; struct ptlrpc_request *req; diff --git a/lustre/ptlrpc/gss/gss_internal.h b/lustre/ptlrpc/gss/gss_internal.h index bf93e65..690704e 100644 --- a/lustre/ptlrpc/gss/gss_internal.h +++ b/lustre/ptlrpc/gss/gss_internal.h @@ -470,7 +470,7 @@ __u32 g_verify_token_header(rawobj_t *mech, int *body_size, /* gss_cli_upcall.c */ -int gss_do_ctx_init_rpc(char *buffer, unsigned long count); +int gss_do_ctx_init_rpc(char __user *buffer, unsigned long count); int gss_do_ctx_fini_rpc(struct gss_cli_ctx *gctx); int __init gss_init_cli_upcall(void); -- 1.8.3.1