Unverified Commit 152a72b4 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10530 ftruncate: pass a signed offset 

Merge Pull Request from: @ci-robot 
 
PR sync from: Long Li <leo.lilong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/XNLDMJOJMCBUV6H6CJK43EZCXEAMJAS4/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAGEOW 
 
Link:https://gitee.com/openeuler/kernel/pulls/10530

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 62884474 b95ecee3

fs/open.c

+2 −2
Original line number Diff line number Diff line
@@ -200,13 +200,13 @@ long do_sys_ftruncate(unsigned int fd, loff_t length, int small) 
	return error;

}



SYSCALL_DEFINE2(ftruncate, unsigned int, fd, unsigned long, length)

SYSCALL_DEFINE2(ftruncate, unsigned int, fd, off_t, length)

{

	return do_sys_ftruncate(fd, length, 1);

}



#ifdef CONFIG_COMPAT

COMPAT_SYSCALL_DEFINE2(ftruncate, unsigned int, fd, compat_ulong_t, length)

COMPAT_SYSCALL_DEFINE2(ftruncate, unsigned int, fd, compat_off_t, length)

{

	return do_sys_ftruncate(fd, length, 1);

}

include/linux/compat.h

+1 −1
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ asmlinkage long compat_sys_fstatfs(unsigned int fd, 
asmlinkage long compat_sys_fstatfs64(unsigned int fd, compat_size_t sz,

				     struct compat_statfs64 __user *buf);

asmlinkage long compat_sys_truncate(const char __user *, compat_off_t);

asmlinkage long compat_sys_ftruncate(unsigned int, compat_ulong_t);

asmlinkage long compat_sys_ftruncate(unsigned int, compat_off_t);

/* No generic prototype for truncate64, ftruncate64, fallocate */

asmlinkage long compat_sys_openat(int dfd, const char __user *filename,

				  int flags, umode_t mode);

include/linux/syscalls.h

+1 −1
Original line number Diff line number Diff line
@@ -447,7 +447,7 @@ asmlinkage long sys_fstatfs(unsigned int fd, struct statfs __user *buf); 
asmlinkage long sys_fstatfs64(unsigned int fd, size_t sz,

				struct statfs64 __user *buf);

asmlinkage long sys_truncate(const char __user *path, long length);

asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);

asmlinkage long sys_ftruncate(unsigned int fd, off_t length);

#if BITS_PER_LONG == 32

asmlinkage long sys_truncate64(const char __user *path, loff_t length);

asmlinkage long sys_ftruncate64(unsigned int fd, loff_t length);