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 <oleg.drokin@intel.com>
Change-Id: I10c1a7dd58531886bf8cfa8c684ea6fba321c511
Reviewed-on: http://review.whamcloud.com/17790
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Jeremy Filizetti <jeremy.filizetti@gmail.com>
Reviewed-by: Sebastien Buisson <sbuisson@ddn.com>
Reviewed-by: Frank Zago <fzago@cray.com>

diff --git a/lustre/ptlrpc/gss/gss_cli_upcall.c b/lustre/ptlrpc/gss/gss_cli_upcall.c
index 4c6a33f..67e7480 100644 (file)
--- 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   */
 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   */
         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   */
         long            reply_buf_size; /* in   */

-        char           *reply_buf;      /* in   */
+       char __user    *reply_buf;      /* in   */

         long            status;         /* out  */
         long            reply_length;   /* out  */
 };
 
         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;
 {
         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 (file)
--- 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 */
 
 
 /* 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);
 int gss_do_ctx_fini_rpc(struct gss_cli_ctx *gctx);
 
 int  __init gss_init_cli_upcall(void);