dlm: receive_rcom_lock_args() overflow check

[cascardo/linux.git] / fs / dlm / dlm_internal.h

diff --git a/fs/dlm/dlm_internal.h b/fs/dlm/dlm_internal.h
index ec61bba..f7fbaec 100644 (file)
--- a/fs/dlm/dlm_internal.h
+++ b/fs/dlm/dlm_internal.h
@@ -403,28 +403,34 @@ struct dlm_rcom {
        char                    rc_buf[0];
 };
 
+union dlm_packet {
+       struct dlm_header       header;         /* common to other two */
+       struct dlm_message      message;
+       struct dlm_rcom         rcom;
+};
+
 struct rcom_config {
-       uint32_t                rf_lvblen;
-       uint32_t                rf_lsflags;
-       uint64_t                rf_unused;
+       __le32                  rf_lvblen;
+       __le32                  rf_lsflags;
+       __le64                  rf_unused;
 };
 
 struct rcom_lock {
-       uint32_t                rl_ownpid;
-       uint32_t                rl_lkid;
-       uint32_t                rl_remid;
-       uint32_t                rl_parent_lkid;
-       uint32_t                rl_parent_remid;
-       uint32_t                rl_exflags;
-       uint32_t                rl_flags;
-       uint32_t                rl_lvbseq;
-       int                     rl_result;
+       __le32                  rl_ownpid;
+       __le32                  rl_lkid;
+       __le32                  rl_remid;
+       __le32                  rl_parent_lkid;
+       __le32                  rl_parent_remid;
+       __le32                  rl_exflags;
+       __le32                  rl_flags;
+       __le32                  rl_lvbseq;
+       __le32                  rl_result;
        int8_t                  rl_rqmode;
        int8_t                  rl_grmode;
        int8_t                  rl_status;
        int8_t                  rl_asts;
-       uint16_t                rl_wait_type;
-       uint16_t                rl_namelen;
+       __le16                  rl_wait_type;
+       __le16                  rl_namelen;
        char                    rl_name[DLM_RESNAME_MAXLEN];
        char                    rl_lvb[0];
 };
@@ -494,7 +500,7 @@ struct dlm_ls {
        struct rw_semaphore     ls_recv_active; /* block dlm_recv */
        struct list_head        ls_requestqueue;/* queue remote requests */
        struct mutex            ls_requestqueue_mutex;
-       char                    *ls_recover_buf;
+       struct dlm_rcom         *ls_recover_buf;
        int                     ls_recover_nodeid; /* for debugging */
        uint64_t                ls_rcom_seq;
        spinlock_t              ls_rcom_spin;