Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5714156b authored by Al Viro's avatar Al Viro Committed by Mike Marshall
Browse files

orangefs: sanitize pvfs2_convert_time_field() 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarMike Marshall <hubcap@omnibond.com>
parent aada5c58

fs/orangefs/pvfs2-kernel.h

+4 −1
Original line number Diff line number Diff line
@@ -638,7 +638,10 @@ int pvfs2_unmount_sb(struct super_block *sb); 


int pvfs2_cancel_op_in_progress(__u64 tag);



__u64 pvfs2_convert_time_field(void *time_ptr);

static inline __u64 pvfs2_convert_time_field(const struct timespec *ts)

{

	return (__u64)ts->tv_sec;

}



int pvfs2_normalize_to_errno(__s32 error_code);

fs/orangefs/pvfs2-utils.c

+2 −11
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ static inline int copy_attributes_from_inode(struct inode *inode, 
		attrs->mask |= PVFS_ATTR_SYS_ATIME;

		if (iattr->ia_valid & ATTR_ATIME_SET) {

			attrs->atime =

			    pvfs2_convert_time_field((void *)&iattr->ia_atime);

			    pvfs2_convert_time_field(&iattr->ia_atime);

			attrs->mask |= PVFS_ATTR_SYS_ATIME_SET;

		}

	}
@@ -306,7 +306,7 @@ static inline int copy_attributes_from_inode(struct inode *inode, 
		attrs->mask |= PVFS_ATTR_SYS_MTIME;

		if (iattr->ia_valid & ATTR_MTIME_SET) {

			attrs->mtime =

			    pvfs2_convert_time_field((void *)&iattr->ia_mtime);

			    pvfs2_convert_time_field(&iattr->ia_mtime);

			attrs->mask |= PVFS_ATTR_SYS_MTIME_SET;

		}

	}
@@ -653,15 +653,6 @@ void set_signals(sigset_t *sigset) 
	sigprocmask(SIG_SETMASK, sigset, NULL);

}



__u64 pvfs2_convert_time_field(void *time_ptr)

{

	__u64 pvfs2_time;

	struct timespec *tspec = (struct timespec *)time_ptr;



	pvfs2_time = (__u64) ((time_t) tspec->tv_sec);

	return pvfs2_time;

}



/*

 * The following is a very dirty hack that is now a permanent part of the

 * PVFS2 protocol. See protocol.h for more error definitions.