1 // SPDX-License-Identifier: GPL-2.0 1 // SPDX-License-Identifier: GPL-2.0
2 /* 2 /*
3 * linux/fs/stat.c 3 * linux/fs/stat.c
4 * 4 *
5 * Copyright (C) 1991, 1992 Linus Torvalds 5 * Copyright (C) 1991, 1992 Linus Torvalds
6 */ 6 */
7 7
8 #include <linux/blkdev.h> <<
9 #include <linux/export.h> 8 #include <linux/export.h>
10 #include <linux/mm.h> 9 #include <linux/mm.h>
11 #include <linux/errno.h> 10 #include <linux/errno.h>
12 #include <linux/file.h> 11 #include <linux/file.h>
13 #include <linux/highuid.h> 12 #include <linux/highuid.h>
14 #include <linux/fs.h> 13 #include <linux/fs.h>
15 #include <linux/namei.h> 14 #include <linux/namei.h>
16 #include <linux/security.h> 15 #include <linux/security.h>
17 #include <linux/cred.h> 16 #include <linux/cred.h>
18 #include <linux/syscalls.h> 17 #include <linux/syscalls.h>
19 #include <linux/pagemap.h> 18 #include <linux/pagemap.h>
20 #include <linux/compat.h> 19 #include <linux/compat.h>
21 #include <linux/iversion.h> <<
22 20
23 #include <linux/uaccess.h> 21 #include <linux/uaccess.h>
24 #include <asm/unistd.h> 22 #include <asm/unistd.h>
25 23
26 #include "internal.h" <<
27 #include "mount.h" <<
28 <<
29 /** 24 /**
30 * generic_fillattr - Fill in the basic attrib 25 * generic_fillattr - Fill in the basic attributes from the inode struct
31 * @idmap: idmap of the mount the !! 26 * @inode: Inode to use as the source
32 * @request_mask: statx request_mask !! 27 * @stat: Where to fill in the attributes
33 * @inode: Inode to use as the so <<
34 * @stat: Where to fill in the a <<
35 * 28 *
36 * Fill in the basic attributes in the kstat s 29 * Fill in the basic attributes in the kstat structure from data that's to be
37 * found on the VFS inode structure. This is 30 * found on the VFS inode structure. This is the default if no getattr inode
38 * operation is supplied. 31 * operation is supplied.
39 * <<
40 * If the inode has been found through an idma <<
41 * the vfsmount must be passed through @idmap. <<
42 * take care to map the inode according to @id <<
43 * uid and gid filds. On non-idmapped mounts o <<
44 * performed on the raw inode simply pass @nop <<
45 */ 32 */
46 void generic_fillattr(struct mnt_idmap *idmap, !! 33 void generic_fillattr(struct inode *inode, struct kstat *stat)
47 struct inode *inode, str <<
48 { 34 {
49 vfsuid_t vfsuid = i_uid_into_vfsuid(id <<
50 vfsgid_t vfsgid = i_gid_into_vfsgid(id <<
51 <<
52 stat->dev = inode->i_sb->s_dev; 35 stat->dev = inode->i_sb->s_dev;
53 stat->ino = inode->i_ino; 36 stat->ino = inode->i_ino;
54 stat->mode = inode->i_mode; 37 stat->mode = inode->i_mode;
55 stat->nlink = inode->i_nlink; 38 stat->nlink = inode->i_nlink;
56 stat->uid = vfsuid_into_kuid(vfsuid); !! 39 stat->uid = inode->i_uid;
57 stat->gid = vfsgid_into_kgid(vfsgid); !! 40 stat->gid = inode->i_gid;
58 stat->rdev = inode->i_rdev; 41 stat->rdev = inode->i_rdev;
59 stat->size = i_size_read(inode); 42 stat->size = i_size_read(inode);
60 stat->atime = inode_get_atime(inode); !! 43 stat->atime = inode->i_atime;
61 stat->mtime = inode_get_mtime(inode); !! 44 stat->mtime = inode->i_mtime;
62 stat->ctime = inode_get_ctime(inode); !! 45 stat->ctime = inode->i_ctime;
63 stat->blksize = i_blocksize(inode); 46 stat->blksize = i_blocksize(inode);
64 stat->blocks = inode->i_blocks; 47 stat->blocks = inode->i_blocks;
65 48
66 if ((request_mask & STATX_CHANGE_COOKI !! 49 if (IS_NOATIME(inode))
67 stat->result_mask |= STATX_CHA !! 50 stat->result_mask &= ~STATX_ATIME;
68 stat->change_cookie = inode_qu !! 51 if (IS_AUTOMOUNT(inode))
69 } !! 52 stat->attributes |= STATX_ATTR_AUTOMOUNT;
70 <<
71 } 53 }
72 EXPORT_SYMBOL(generic_fillattr); 54 EXPORT_SYMBOL(generic_fillattr);
73 55
74 /** 56 /**
75 * generic_fill_statx_attr - Fill in the statx <<
76 * @inode: Inode to use as the source <<
77 * @stat: Where to fill in the attribute <<
78 * <<
79 * Fill in the STATX_ATTR_* flags in the kstat <<
80 * inode that are published on i_flags and enf <<
81 */ <<
82 void generic_fill_statx_attr(struct inode *ino <<
83 { <<
84 if (inode->i_flags & S_IMMUTABLE) <<
85 stat->attributes |= STATX_ATTR <<
86 if (inode->i_flags & S_APPEND) <<
87 stat->attributes |= STATX_ATTR <<
88 stat->attributes_mask |= KSTAT_ATTR_VF <<
89 } <<
90 EXPORT_SYMBOL(generic_fill_statx_attr); <<
91 <<
92 /** <<
93 * generic_fill_statx_atomic_writes - Fill in <<
94 * @stat: Where to fill in the attribute <<
95 * @unit_min: Minimum supported atomic write <<
96 * @unit_max: Maximum supported atomic write <<
97 * <<
98 * Fill in the STATX{_ATTR}_WRITE_ATOMIC flags <<
99 * atomic write unit_min and unit_max values. <<
100 */ <<
101 void generic_fill_statx_atomic_writes(struct k <<
102 unsigned <<
103 unsigned <<
104 { <<
105 /* Confirm that the request type is kn <<
106 stat->result_mask |= STATX_WRITE_ATOMI <<
107 <<
108 /* Confirm that the file attribute typ <<
109 stat->attributes_mask |= STATX_ATTR_WR <<
110 <<
111 if (unit_min) { <<
112 stat->atomic_write_unit_min = <<
113 stat->atomic_write_unit_max = <<
114 /* Initially only allow 1x seg <<
115 stat->atomic_write_segments_ma <<
116 <<
117 /* Confirm atomic writes are a <<
118 stat->attributes |= STATX_ATTR <<
119 } <<
120 } <<
121 EXPORT_SYMBOL_GPL(generic_fill_statx_atomic_wr <<
122 <<
123 /** <<
124 * vfs_getattr_nosec - getattr without securit 57 * vfs_getattr_nosec - getattr without security checks
125 * @path: file to get attributes from 58 * @path: file to get attributes from
126 * @stat: structure to return attributes in 59 * @stat: structure to return attributes in
127 * @request_mask: STATX_xxx flags indicating w 60 * @request_mask: STATX_xxx flags indicating what the caller wants
128 * @query_flags: Query mode (AT_STATX_SYNC_TYP !! 61 * @query_flags: Query mode (KSTAT_QUERY_FLAGS)
129 * 62 *
130 * Get attributes without calling security_ino 63 * Get attributes without calling security_inode_getattr.
131 * 64 *
132 * Currently the only caller other than vfs_ge 65 * Currently the only caller other than vfs_getattr is internal to the
133 * filehandle lookup code, which uses only the 66 * filehandle lookup code, which uses only the inode number and returns no
134 * attributes to any user. Any other code pro 67 * attributes to any user. Any other code probably wants vfs_getattr.
135 */ 68 */
136 int vfs_getattr_nosec(const struct path *path, 69 int vfs_getattr_nosec(const struct path *path, struct kstat *stat,
137 u32 request_mask, unsign 70 u32 request_mask, unsigned int query_flags)
138 { 71 {
139 struct mnt_idmap *idmap; <<
140 struct inode *inode = d_backing_inode( 72 struct inode *inode = d_backing_inode(path->dentry);
141 73
142 memset(stat, 0, sizeof(*stat)); 74 memset(stat, 0, sizeof(*stat));
143 stat->result_mask |= STATX_BASIC_STATS 75 stat->result_mask |= STATX_BASIC_STATS;
144 query_flags &= AT_STATX_SYNC_TYPE; !! 76 request_mask &= STATX_ALL;
145 !! 77 query_flags &= KSTAT_QUERY_FLAGS;
146 /* allow the fs to override these if i <<
147 /* SB_NOATIME means filesystem supplie <<
148 if (inode->i_sb->s_flags & SB_NOATIME) <<
149 stat->result_mask &= ~STATX_AT <<
150 <<
151 /* <<
152 * Note: If you add another clause to <<
153 * update attributes_mask below. <<
154 */ <<
155 if (IS_AUTOMOUNT(inode)) <<
156 stat->attributes |= STATX_ATTR <<
157 <<
158 if (IS_DAX(inode)) <<
159 stat->attributes |= STATX_ATTR <<
160 <<
161 stat->attributes_mask |= (STATX_ATTR_A <<
162 STATX_ATTR_D <<
163 <<
164 idmap = mnt_idmap(path->mnt); <<
165 if (inode->i_op->getattr) 78 if (inode->i_op->getattr)
166 return inode->i_op->getattr(id !! 79 return inode->i_op->getattr(path, stat, request_mask,
167 re !! 80 query_flags);
168 qu <<
169 81
170 generic_fillattr(idmap, request_mask, !! 82 generic_fillattr(inode, stat);
171 return 0; 83 return 0;
172 } 84 }
173 EXPORT_SYMBOL(vfs_getattr_nosec); 85 EXPORT_SYMBOL(vfs_getattr_nosec);
174 86
175 /* 87 /*
176 * vfs_getattr - Get the enhanced basic attrib 88 * vfs_getattr - Get the enhanced basic attributes of a file
177 * @path: The file of interest 89 * @path: The file of interest
178 * @stat: Where to return the statistics 90 * @stat: Where to return the statistics
179 * @request_mask: STATX_xxx flags indicating w 91 * @request_mask: STATX_xxx flags indicating what the caller wants
180 * @query_flags: Query mode (AT_STATX_SYNC_TYP !! 92 * @query_flags: Query mode (KSTAT_QUERY_FLAGS)
181 * 93 *
182 * Ask the filesystem for a file's attributes. 94 * Ask the filesystem for a file's attributes. The caller must indicate in
183 * request_mask and query_flags to indicate wh 95 * request_mask and query_flags to indicate what they want.
184 * 96 *
185 * If the file is remote, the filesystem can b 97 * If the file is remote, the filesystem can be forced to update the attributes
186 * from the backing store by passing AT_STATX_ 98 * from the backing store by passing AT_STATX_FORCE_SYNC in query_flags or can
187 * suppress the update by passing AT_STATX_DON 99 * suppress the update by passing AT_STATX_DONT_SYNC.
188 * 100 *
189 * Bits must have been set in request_mask to 101 * Bits must have been set in request_mask to indicate which attributes the
190 * caller wants retrieving. Any such attribut 102 * caller wants retrieving. Any such attribute not requested may be returned
191 * anyway, but the value may be approximate, a 103 * anyway, but the value may be approximate, and, if remote, may not have been
192 * synchronised with the server. 104 * synchronised with the server.
193 * 105 *
194 * 0 will be returned on success, and a -ve er 106 * 0 will be returned on success, and a -ve error code if unsuccessful.
195 */ 107 */
196 int vfs_getattr(const struct path *path, struc 108 int vfs_getattr(const struct path *path, struct kstat *stat,
197 u32 request_mask, unsigned int 109 u32 request_mask, unsigned int query_flags)
198 { 110 {
199 int retval; 111 int retval;
200 112
201 if (WARN_ON_ONCE(query_flags & AT_GETA <<
202 return -EPERM; <<
203 <<
204 retval = security_inode_getattr(path); 113 retval = security_inode_getattr(path);
205 if (retval) 114 if (retval)
206 return retval; 115 return retval;
207 return vfs_getattr_nosec(path, stat, r 116 return vfs_getattr_nosec(path, stat, request_mask, query_flags);
208 } 117 }
209 EXPORT_SYMBOL(vfs_getattr); 118 EXPORT_SYMBOL(vfs_getattr);
210 119
211 /** 120 /**
212 * vfs_fstat - Get the basic attributes by fil !! 121 * vfs_statx_fd - Get the enhanced basic attributes by file descriptor
213 * @fd: The file descriptor referring to the f 122 * @fd: The file descriptor referring to the file of interest
214 * @stat: The result structure to fill in. 123 * @stat: The result structure to fill in.
>> 124 * @request_mask: STATX_xxx flags indicating what the caller wants
>> 125 * @query_flags: Query mode (KSTAT_QUERY_FLAGS)
215 * 126 *
216 * This function is a wrapper around vfs_getat 127 * This function is a wrapper around vfs_getattr(). The main difference is
217 * that it uses a file descriptor to determine 128 * that it uses a file descriptor to determine the file location.
218 * 129 *
219 * 0 will be returned on success, and a -ve er 130 * 0 will be returned on success, and a -ve error code if unsuccessful.
220 */ 131 */
221 int vfs_fstat(int fd, struct kstat *stat) !! 132 int vfs_statx_fd(unsigned int fd, struct kstat *stat,
>> 133 u32 request_mask, unsigned int query_flags)
222 { 134 {
223 struct fd f; 135 struct fd f;
224 int error; !! 136 int error = -EBADF;
225 137
226 f = fdget_raw(fd); !! 138 if (query_flags & ~KSTAT_QUERY_FLAGS)
227 if (!f.file) !! 139 return -EINVAL;
228 return -EBADF; <<
229 error = vfs_getattr(&f.file->f_path, s <<
230 fdput(f); <<
231 return error; <<
232 } <<
233 <<
234 int getname_statx_lookup_flags(int flags) <<
235 { <<
236 int lookup_flags = 0; <<
237 <<
238 if (!(flags & AT_SYMLINK_NOFOLLOW)) <<
239 lookup_flags |= LOOKUP_FOLLOW; <<
240 if (!(flags & AT_NO_AUTOMOUNT)) <<
241 lookup_flags |= LOOKUP_AUTOMOU <<
242 if (flags & AT_EMPTY_PATH) <<
243 lookup_flags |= LOOKUP_EMPTY; <<
244 <<
245 return lookup_flags; <<
246 } <<
247 <<
248 static int vfs_statx_path(struct path *path, i <<
249 u32 request_mask) <<
250 { <<
251 int error = vfs_getattr(path, stat, re <<
252 140
253 if (request_mask & STATX_MNT_ID_UNIQUE !! 141 f = fdget_raw(fd);
254 stat->mnt_id = real_mount(path !! 142 if (f.file) {
255 stat->result_mask |= STATX_MNT !! 143 error = vfs_getattr(&f.file->f_path, stat,
256 } else { !! 144 request_mask, query_flags);
257 stat->mnt_id = real_mount(path !! 145 fdput(f);
258 stat->result_mask |= STATX_MNT <<
259 } 146 }
260 <<
261 if (path_mounted(path)) <<
262 stat->attributes |= STATX_ATTR <<
263 stat->attributes_mask |= STATX_ATTR_MO <<
264 <<
265 /* <<
266 * If this is a block device inode, ov <<
267 * attributes with the block device sp <<
268 * obtained from the bdev backing inod <<
269 */ <<
270 if (S_ISBLK(stat->mode)) <<
271 bdev_statx(path, stat, request <<
272 <<
273 return error; 147 return error;
274 } 148 }
275 !! 149 EXPORT_SYMBOL(vfs_statx_fd);
276 static int vfs_statx_fd(int fd, int flags, str <<
277 u32 request_mask) <<
278 { <<
279 CLASS(fd_raw, f)(fd); <<
280 if (!f.file) <<
281 return -EBADF; <<
282 return vfs_statx_path(&f.file->f_path, <<
283 } <<
284 150
285 /** 151 /**
286 * vfs_statx - Get basic and extra attributes 152 * vfs_statx - Get basic and extra attributes by filename
287 * @dfd: A file descriptor representing the ba 153 * @dfd: A file descriptor representing the base dir for a relative filename
288 * @filename: The name of the file of interest 154 * @filename: The name of the file of interest
289 * @flags: Flags to control the query 155 * @flags: Flags to control the query
290 * @stat: The result structure to fill in. 156 * @stat: The result structure to fill in.
291 * @request_mask: STATX_xxx flags indicating w 157 * @request_mask: STATX_xxx flags indicating what the caller wants
292 * 158 *
293 * This function is a wrapper around vfs_getat 159 * This function is a wrapper around vfs_getattr(). The main difference is
294 * that it uses a filename and base directory 160 * that it uses a filename and base directory to determine the file location.
295 * Additionally, the use of AT_SYMLINK_NOFOLLO 161 * Additionally, the use of AT_SYMLINK_NOFOLLOW in flags will prevent a symlink
296 * at the given name from being referenced. 162 * at the given name from being referenced.
297 * 163 *
298 * 0 will be returned on success, and a -ve er 164 * 0 will be returned on success, and a -ve error code if unsuccessful.
299 */ 165 */
300 static int vfs_statx(int dfd, struct filename !! 166 int vfs_statx(int dfd, const char __user *filename, int flags,
301 struct kstat *stat, u32 request_ 167 struct kstat *stat, u32 request_mask)
302 { 168 {
303 struct path path; 169 struct path path;
304 unsigned int lookup_flags = getname_st !! 170 int error = -EINVAL;
305 int error; !! 171 unsigned int lookup_flags = LOOKUP_FOLLOW | LOOKUP_AUTOMOUNT;
306 172
307 if (flags & ~(AT_SYMLINK_NOFOLLOW | AT !! 173 if ((flags & ~(AT_SYMLINK_NOFOLLOW | AT_NO_AUTOMOUNT |
308 AT_STATX_SYNC_TYPE)) !! 174 AT_EMPTY_PATH | KSTAT_QUERY_FLAGS)) != 0)
309 return -EINVAL; 175 return -EINVAL;
310 176
>> 177 if (flags & AT_SYMLINK_NOFOLLOW)
>> 178 lookup_flags &= ~LOOKUP_FOLLOW;
>> 179 if (flags & AT_NO_AUTOMOUNT)
>> 180 lookup_flags &= ~LOOKUP_AUTOMOUNT;
>> 181 if (flags & AT_EMPTY_PATH)
>> 182 lookup_flags |= LOOKUP_EMPTY;
>> 183
311 retry: 184 retry:
312 error = filename_lookup(dfd, filename, !! 185 error = user_path_at(dfd, filename, lookup_flags, &path);
313 if (error) 186 if (error)
314 return error; !! 187 goto out;
315 error = vfs_statx_path(&path, flags, s !! 188
>> 189 error = vfs_getattr(&path, stat, request_mask, flags);
316 path_put(&path); 190 path_put(&path);
317 if (retry_estale(error, lookup_flags)) 191 if (retry_estale(error, lookup_flags)) {
318 lookup_flags |= LOOKUP_REVAL; 192 lookup_flags |= LOOKUP_REVAL;
319 goto retry; 193 goto retry;
320 } 194 }
>> 195 out:
321 return error; 196 return error;
322 } 197 }
>> 198 EXPORT_SYMBOL(vfs_statx);
323 199
324 int vfs_fstatat(int dfd, const char __user *fi <<
325 struct kstat *st <<
326 { <<
327 int ret; <<
328 int statx_flags = flags | AT_NO_AUTOMO <<
329 struct filename *name; <<
330 <<
331 /* <<
332 * Work around glibc turning fstat() i <<
333 * <<
334 * If AT_EMPTY_PATH is set, we expect <<
335 * empty path, and avoid doing all the <<
336 */ <<
337 if (flags == AT_EMPTY_PATH && vfs_empt <<
338 return vfs_fstat(dfd, stat); <<
339 <<
340 name = getname_flags(filename, getname <<
341 ret = vfs_statx(dfd, name, statx_flags <<
342 putname(name); <<
343 <<
344 return ret; <<
345 } <<
346 200
347 #ifdef __ARCH_WANT_OLD_STAT 201 #ifdef __ARCH_WANT_OLD_STAT
348 202
349 /* 203 /*
350 * For backward compatibility? Maybe this sho 204 * For backward compatibility? Maybe this should be moved
351 * into arch/i386 instead? 205 * into arch/i386 instead?
352 */ 206 */
353 static int cp_old_stat(struct kstat *stat, str 207 static int cp_old_stat(struct kstat *stat, struct __old_kernel_stat __user * statbuf)
354 { 208 {
355 static int warncount = 5; 209 static int warncount = 5;
356 struct __old_kernel_stat tmp; 210 struct __old_kernel_stat tmp;
357 211
358 if (warncount > 0) { 212 if (warncount > 0) {
359 warncount--; 213 warncount--;
360 printk(KERN_WARNING "VFS: Warn 214 printk(KERN_WARNING "VFS: Warning: %s using old stat() call. Recompile your binary.\n",
361 current->comm); 215 current->comm);
362 } else if (warncount < 0) { 216 } else if (warncount < 0) {
363 /* it's laughable, but... */ 217 /* it's laughable, but... */
364 warncount = 0; 218 warncount = 0;
365 } 219 }
366 220
367 memset(&tmp, 0, sizeof(struct __old_ke 221 memset(&tmp, 0, sizeof(struct __old_kernel_stat));
368 tmp.st_dev = old_encode_dev(stat->dev) 222 tmp.st_dev = old_encode_dev(stat->dev);
369 tmp.st_ino = stat->ino; 223 tmp.st_ino = stat->ino;
370 if (sizeof(tmp.st_ino) < sizeof(stat-> 224 if (sizeof(tmp.st_ino) < sizeof(stat->ino) && tmp.st_ino != stat->ino)
371 return -EOVERFLOW; 225 return -EOVERFLOW;
372 tmp.st_mode = stat->mode; 226 tmp.st_mode = stat->mode;
373 tmp.st_nlink = stat->nlink; 227 tmp.st_nlink = stat->nlink;
374 if (tmp.st_nlink != stat->nlink) 228 if (tmp.st_nlink != stat->nlink)
375 return -EOVERFLOW; 229 return -EOVERFLOW;
376 SET_UID(tmp.st_uid, from_kuid_munged(c 230 SET_UID(tmp.st_uid, from_kuid_munged(current_user_ns(), stat->uid));
377 SET_GID(tmp.st_gid, from_kgid_munged(c 231 SET_GID(tmp.st_gid, from_kgid_munged(current_user_ns(), stat->gid));
378 tmp.st_rdev = old_encode_dev(stat->rde 232 tmp.st_rdev = old_encode_dev(stat->rdev);
379 #if BITS_PER_LONG == 32 233 #if BITS_PER_LONG == 32
380 if (stat->size > MAX_NON_LFS) 234 if (stat->size > MAX_NON_LFS)
381 return -EOVERFLOW; 235 return -EOVERFLOW;
382 #endif 236 #endif
383 tmp.st_size = stat->size; 237 tmp.st_size = stat->size;
384 tmp.st_atime = stat->atime.tv_sec; 238 tmp.st_atime = stat->atime.tv_sec;
385 tmp.st_mtime = stat->mtime.tv_sec; 239 tmp.st_mtime = stat->mtime.tv_sec;
386 tmp.st_ctime = stat->ctime.tv_sec; 240 tmp.st_ctime = stat->ctime.tv_sec;
387 return copy_to_user(statbuf,&tmp,sizeo 241 return copy_to_user(statbuf,&tmp,sizeof(tmp)) ? -EFAULT : 0;
388 } 242 }
389 243
390 SYSCALL_DEFINE2(stat, const char __user *, fil 244 SYSCALL_DEFINE2(stat, const char __user *, filename,
391 struct __old_kernel_stat __use 245 struct __old_kernel_stat __user *, statbuf)
392 { 246 {
393 struct kstat stat; 247 struct kstat stat;
394 int error; 248 int error;
395 249
396 error = vfs_stat(filename, &stat); 250 error = vfs_stat(filename, &stat);
397 if (error) 251 if (error)
398 return error; 252 return error;
399 253
400 return cp_old_stat(&stat, statbuf); 254 return cp_old_stat(&stat, statbuf);
401 } 255 }
402 256
403 SYSCALL_DEFINE2(lstat, const char __user *, fi 257 SYSCALL_DEFINE2(lstat, const char __user *, filename,
404 struct __old_kernel_stat __use 258 struct __old_kernel_stat __user *, statbuf)
405 { 259 {
406 struct kstat stat; 260 struct kstat stat;
407 int error; 261 int error;
408 262
409 error = vfs_lstat(filename, &stat); 263 error = vfs_lstat(filename, &stat);
410 if (error) 264 if (error)
411 return error; 265 return error;
412 266
413 return cp_old_stat(&stat, statbuf); 267 return cp_old_stat(&stat, statbuf);
414 } 268 }
415 269
416 SYSCALL_DEFINE2(fstat, unsigned int, fd, struc 270 SYSCALL_DEFINE2(fstat, unsigned int, fd, struct __old_kernel_stat __user *, statbuf)
417 { 271 {
418 struct kstat stat; 272 struct kstat stat;
419 int error = vfs_fstat(fd, &stat); 273 int error = vfs_fstat(fd, &stat);
420 274
421 if (!error) 275 if (!error)
422 error = cp_old_stat(&stat, sta 276 error = cp_old_stat(&stat, statbuf);
423 277
424 return error; 278 return error;
425 } 279 }
426 280
427 #endif /* __ARCH_WANT_OLD_STAT */ 281 #endif /* __ARCH_WANT_OLD_STAT */
428 282
429 #ifdef __ARCH_WANT_NEW_STAT !! 283 #if BITS_PER_LONG == 32
>> 284 # define choose_32_64(a,b) a
>> 285 #else
>> 286 # define choose_32_64(a,b) b
>> 287 #endif
>> 288
>> 289 #define valid_dev(x) choose_32_64(old_valid_dev(x),true)
>> 290 #define encode_dev(x) choose_32_64(old_encode_dev,new_encode_dev)(x)
430 291
431 #ifndef INIT_STRUCT_STAT_PADDING 292 #ifndef INIT_STRUCT_STAT_PADDING
432 # define INIT_STRUCT_STAT_PADDING(st) memset( 293 # define INIT_STRUCT_STAT_PADDING(st) memset(&st, 0, sizeof(st))
433 #endif 294 #endif
434 295
435 static int cp_new_stat(struct kstat *stat, str 296 static int cp_new_stat(struct kstat *stat, struct stat __user *statbuf)
436 { 297 {
437 struct stat tmp; 298 struct stat tmp;
438 299
439 if (sizeof(tmp.st_dev) < 4 && !old_val !! 300 if (!valid_dev(stat->dev) || !valid_dev(stat->rdev))
440 return -EOVERFLOW; <<
441 if (sizeof(tmp.st_rdev) < 4 && !old_va <<
442 return -EOVERFLOW; 301 return -EOVERFLOW;
443 #if BITS_PER_LONG == 32 302 #if BITS_PER_LONG == 32
444 if (stat->size > MAX_NON_LFS) 303 if (stat->size > MAX_NON_LFS)
445 return -EOVERFLOW; 304 return -EOVERFLOW;
446 #endif 305 #endif
447 306
448 INIT_STRUCT_STAT_PADDING(tmp); 307 INIT_STRUCT_STAT_PADDING(tmp);
449 tmp.st_dev = new_encode_dev(stat->dev) !! 308 tmp.st_dev = encode_dev(stat->dev);
450 tmp.st_ino = stat->ino; 309 tmp.st_ino = stat->ino;
451 if (sizeof(tmp.st_ino) < sizeof(stat-> 310 if (sizeof(tmp.st_ino) < sizeof(stat->ino) && tmp.st_ino != stat->ino)
452 return -EOVERFLOW; 311 return -EOVERFLOW;
453 tmp.st_mode = stat->mode; 312 tmp.st_mode = stat->mode;
454 tmp.st_nlink = stat->nlink; 313 tmp.st_nlink = stat->nlink;
455 if (tmp.st_nlink != stat->nlink) 314 if (tmp.st_nlink != stat->nlink)
456 return -EOVERFLOW; 315 return -EOVERFLOW;
457 SET_UID(tmp.st_uid, from_kuid_munged(c 316 SET_UID(tmp.st_uid, from_kuid_munged(current_user_ns(), stat->uid));
458 SET_GID(tmp.st_gid, from_kgid_munged(c 317 SET_GID(tmp.st_gid, from_kgid_munged(current_user_ns(), stat->gid));
459 tmp.st_rdev = new_encode_dev(stat->rde !! 318 tmp.st_rdev = encode_dev(stat->rdev);
460 tmp.st_size = stat->size; 319 tmp.st_size = stat->size;
461 tmp.st_atime = stat->atime.tv_sec; 320 tmp.st_atime = stat->atime.tv_sec;
462 tmp.st_mtime = stat->mtime.tv_sec; 321 tmp.st_mtime = stat->mtime.tv_sec;
463 tmp.st_ctime = stat->ctime.tv_sec; 322 tmp.st_ctime = stat->ctime.tv_sec;
464 #ifdef STAT_HAVE_NSEC 323 #ifdef STAT_HAVE_NSEC
465 tmp.st_atime_nsec = stat->atime.tv_nse 324 tmp.st_atime_nsec = stat->atime.tv_nsec;
466 tmp.st_mtime_nsec = stat->mtime.tv_nse 325 tmp.st_mtime_nsec = stat->mtime.tv_nsec;
467 tmp.st_ctime_nsec = stat->ctime.tv_nse 326 tmp.st_ctime_nsec = stat->ctime.tv_nsec;
468 #endif 327 #endif
469 tmp.st_blocks = stat->blocks; 328 tmp.st_blocks = stat->blocks;
470 tmp.st_blksize = stat->blksize; 329 tmp.st_blksize = stat->blksize;
471 return copy_to_user(statbuf,&tmp,sizeo 330 return copy_to_user(statbuf,&tmp,sizeof(tmp)) ? -EFAULT : 0;
472 } 331 }
473 332
474 SYSCALL_DEFINE2(newstat, const char __user *, 333 SYSCALL_DEFINE2(newstat, const char __user *, filename,
475 struct stat __user *, statbuf) 334 struct stat __user *, statbuf)
476 { 335 {
477 struct kstat stat; 336 struct kstat stat;
478 int error = vfs_stat(filename, &stat); 337 int error = vfs_stat(filename, &stat);
479 338
480 if (error) 339 if (error)
481 return error; 340 return error;
482 return cp_new_stat(&stat, statbuf); 341 return cp_new_stat(&stat, statbuf);
483 } 342 }
484 343
485 SYSCALL_DEFINE2(newlstat, const char __user *, 344 SYSCALL_DEFINE2(newlstat, const char __user *, filename,
486 struct stat __user *, statbuf) 345 struct stat __user *, statbuf)
487 { 346 {
488 struct kstat stat; 347 struct kstat stat;
489 int error; 348 int error;
490 349
491 error = vfs_lstat(filename, &stat); 350 error = vfs_lstat(filename, &stat);
492 if (error) 351 if (error)
493 return error; 352 return error;
494 353
495 return cp_new_stat(&stat, statbuf); 354 return cp_new_stat(&stat, statbuf);
496 } 355 }
497 356
498 #if !defined(__ARCH_WANT_STAT64) || defined(__ 357 #if !defined(__ARCH_WANT_STAT64) || defined(__ARCH_WANT_SYS_NEWFSTATAT)
499 SYSCALL_DEFINE4(newfstatat, int, dfd, const ch 358 SYSCALL_DEFINE4(newfstatat, int, dfd, const char __user *, filename,
500 struct stat __user *, statbuf, 359 struct stat __user *, statbuf, int, flag)
501 { 360 {
502 struct kstat stat; 361 struct kstat stat;
503 int error; 362 int error;
504 363
505 error = vfs_fstatat(dfd, filename, &st 364 error = vfs_fstatat(dfd, filename, &stat, flag);
506 if (error) 365 if (error)
507 return error; 366 return error;
508 return cp_new_stat(&stat, statbuf); 367 return cp_new_stat(&stat, statbuf);
509 } 368 }
510 #endif 369 #endif
511 370
512 SYSCALL_DEFINE2(newfstat, unsigned int, fd, st 371 SYSCALL_DEFINE2(newfstat, unsigned int, fd, struct stat __user *, statbuf)
513 { 372 {
514 struct kstat stat; 373 struct kstat stat;
515 int error = vfs_fstat(fd, &stat); 374 int error = vfs_fstat(fd, &stat);
516 375
517 if (!error) 376 if (!error)
518 error = cp_new_stat(&stat, sta 377 error = cp_new_stat(&stat, statbuf);
519 378
520 return error; 379 return error;
521 } 380 }
522 #endif <<
523 381
524 static int do_readlinkat(int dfd, const char _ 382 static int do_readlinkat(int dfd, const char __user *pathname,
525 char __user *buf, int 383 char __user *buf, int bufsiz)
526 { 384 {
527 struct path path; 385 struct path path;
528 struct filename *name; <<
529 int error; 386 int error;
>> 387 int empty = 0;
530 unsigned int lookup_flags = LOOKUP_EMP 388 unsigned int lookup_flags = LOOKUP_EMPTY;
531 389
532 if (bufsiz <= 0) 390 if (bufsiz <= 0)
533 return -EINVAL; 391 return -EINVAL;
534 392
535 retry: 393 retry:
536 name = getname_flags(pathname, lookup_ !! 394 error = user_path_at_empty(dfd, pathname, lookup_flags, &path, &empty);
537 error = filename_lookup(dfd, name, loo !! 395 if (!error) {
538 if (unlikely(error)) { !! 396 struct inode *inode = d_backing_inode(path.dentry);
539 putname(name); !! 397
540 return error; !! 398 error = empty ? -ENOENT : -EINVAL;
541 } !! 399 /*
542 !! 400 * AFS mountpoints allow readlink(2) but are not symlinks
543 /* !! 401 */
544 * AFS mountpoints allow readlink(2) b !! 402 if (d_is_symlink(path.dentry) || inode->i_op->readlink) {
545 */ !! 403 error = security_inode_readlink(path.dentry);
546 if (d_is_symlink(path.dentry) || !! 404 if (!error) {
547 d_backing_inode(path.dentry)->i_op !! 405 touch_atime(&path);
548 error = security_inode_readlin !! 406 error = vfs_readlink(path.dentry, buf, bufsiz);
549 if (!error) { !! 407 }
550 touch_atime(&path); !! 408 }
551 error = vfs_readlink(p !! 409 path_put(&path);
>> 410 if (retry_estale(error, lookup_flags)) {
>> 411 lookup_flags |= LOOKUP_REVAL;
>> 412 goto retry;
552 } 413 }
553 } else { <<
554 error = (name->name[0] == '\0' <<
555 } <<
556 path_put(&path); <<
557 putname(name); <<
558 if (retry_estale(error, lookup_flags)) <<
559 lookup_flags |= LOOKUP_REVAL; <<
560 goto retry; <<
561 } 414 }
562 return error; 415 return error;
563 } 416 }
564 417
565 SYSCALL_DEFINE4(readlinkat, int, dfd, const ch 418 SYSCALL_DEFINE4(readlinkat, int, dfd, const char __user *, pathname,
566 char __user *, buf, int, bufsi 419 char __user *, buf, int, bufsiz)
567 { 420 {
568 return do_readlinkat(dfd, pathname, bu 421 return do_readlinkat(dfd, pathname, buf, bufsiz);
569 } 422 }
570 423
571 SYSCALL_DEFINE3(readlink, const char __user *, 424 SYSCALL_DEFINE3(readlink, const char __user *, path, char __user *, buf,
572 int, bufsiz) 425 int, bufsiz)
573 { 426 {
574 return do_readlinkat(AT_FDCWD, path, b 427 return do_readlinkat(AT_FDCWD, path, buf, bufsiz);
575 } 428 }
576 429
577 430
578 /* ---------- LFS-64 ----------- */ 431 /* ---------- LFS-64 ----------- */
579 #if defined(__ARCH_WANT_STAT64) || defined(__A 432 #if defined(__ARCH_WANT_STAT64) || defined(__ARCH_WANT_COMPAT_STAT64)
580 433
581 #ifndef INIT_STRUCT_STAT64_PADDING 434 #ifndef INIT_STRUCT_STAT64_PADDING
582 # define INIT_STRUCT_STAT64_PADDING(st) memse 435 # define INIT_STRUCT_STAT64_PADDING(st) memset(&st, 0, sizeof(st))
583 #endif 436 #endif
584 437
585 static long cp_new_stat64(struct kstat *stat, 438 static long cp_new_stat64(struct kstat *stat, struct stat64 __user *statbuf)
586 { 439 {
587 struct stat64 tmp; 440 struct stat64 tmp;
588 441
589 INIT_STRUCT_STAT64_PADDING(tmp); 442 INIT_STRUCT_STAT64_PADDING(tmp);
590 #ifdef CONFIG_MIPS 443 #ifdef CONFIG_MIPS
591 /* mips has weird padding, so we don't 444 /* mips has weird padding, so we don't get 64 bits there */
592 tmp.st_dev = new_encode_dev(stat->dev) 445 tmp.st_dev = new_encode_dev(stat->dev);
593 tmp.st_rdev = new_encode_dev(stat->rde 446 tmp.st_rdev = new_encode_dev(stat->rdev);
594 #else 447 #else
595 tmp.st_dev = huge_encode_dev(stat->dev 448 tmp.st_dev = huge_encode_dev(stat->dev);
596 tmp.st_rdev = huge_encode_dev(stat->rd 449 tmp.st_rdev = huge_encode_dev(stat->rdev);
597 #endif 450 #endif
598 tmp.st_ino = stat->ino; 451 tmp.st_ino = stat->ino;
599 if (sizeof(tmp.st_ino) < sizeof(stat-> 452 if (sizeof(tmp.st_ino) < sizeof(stat->ino) && tmp.st_ino != stat->ino)
600 return -EOVERFLOW; 453 return -EOVERFLOW;
601 #ifdef STAT64_HAS_BROKEN_ST_INO 454 #ifdef STAT64_HAS_BROKEN_ST_INO
602 tmp.__st_ino = stat->ino; 455 tmp.__st_ino = stat->ino;
603 #endif 456 #endif
604 tmp.st_mode = stat->mode; 457 tmp.st_mode = stat->mode;
605 tmp.st_nlink = stat->nlink; 458 tmp.st_nlink = stat->nlink;
606 tmp.st_uid = from_kuid_munged(current_ 459 tmp.st_uid = from_kuid_munged(current_user_ns(), stat->uid);
607 tmp.st_gid = from_kgid_munged(current_ 460 tmp.st_gid = from_kgid_munged(current_user_ns(), stat->gid);
608 tmp.st_atime = stat->atime.tv_sec; 461 tmp.st_atime = stat->atime.tv_sec;
609 tmp.st_atime_nsec = stat->atime.tv_nse 462 tmp.st_atime_nsec = stat->atime.tv_nsec;
610 tmp.st_mtime = stat->mtime.tv_sec; 463 tmp.st_mtime = stat->mtime.tv_sec;
611 tmp.st_mtime_nsec = stat->mtime.tv_nse 464 tmp.st_mtime_nsec = stat->mtime.tv_nsec;
612 tmp.st_ctime = stat->ctime.tv_sec; 465 tmp.st_ctime = stat->ctime.tv_sec;
613 tmp.st_ctime_nsec = stat->ctime.tv_nse 466 tmp.st_ctime_nsec = stat->ctime.tv_nsec;
614 tmp.st_size = stat->size; 467 tmp.st_size = stat->size;
615 tmp.st_blocks = stat->blocks; 468 tmp.st_blocks = stat->blocks;
616 tmp.st_blksize = stat->blksize; 469 tmp.st_blksize = stat->blksize;
617 return copy_to_user(statbuf,&tmp,sizeo 470 return copy_to_user(statbuf,&tmp,sizeof(tmp)) ? -EFAULT : 0;
618 } 471 }
619 472
620 SYSCALL_DEFINE2(stat64, const char __user *, f 473 SYSCALL_DEFINE2(stat64, const char __user *, filename,
621 struct stat64 __user *, statbu 474 struct stat64 __user *, statbuf)
622 { 475 {
623 struct kstat stat; 476 struct kstat stat;
624 int error = vfs_stat(filename, &stat); 477 int error = vfs_stat(filename, &stat);
625 478
626 if (!error) 479 if (!error)
627 error = cp_new_stat64(&stat, s 480 error = cp_new_stat64(&stat, statbuf);
628 481
629 return error; 482 return error;
630 } 483 }
631 484
632 SYSCALL_DEFINE2(lstat64, const char __user *, 485 SYSCALL_DEFINE2(lstat64, const char __user *, filename,
633 struct stat64 __user *, statbu 486 struct stat64 __user *, statbuf)
634 { 487 {
635 struct kstat stat; 488 struct kstat stat;
636 int error = vfs_lstat(filename, &stat) 489 int error = vfs_lstat(filename, &stat);
637 490
638 if (!error) 491 if (!error)
639 error = cp_new_stat64(&stat, s 492 error = cp_new_stat64(&stat, statbuf);
640 493
641 return error; 494 return error;
642 } 495 }
643 496
644 SYSCALL_DEFINE2(fstat64, unsigned long, fd, st 497 SYSCALL_DEFINE2(fstat64, unsigned long, fd, struct stat64 __user *, statbuf)
645 { 498 {
646 struct kstat stat; 499 struct kstat stat;
647 int error = vfs_fstat(fd, &stat); 500 int error = vfs_fstat(fd, &stat);
648 501
649 if (!error) 502 if (!error)
650 error = cp_new_stat64(&stat, s 503 error = cp_new_stat64(&stat, statbuf);
651 504
652 return error; 505 return error;
653 } 506 }
654 507
655 SYSCALL_DEFINE4(fstatat64, int, dfd, const cha 508 SYSCALL_DEFINE4(fstatat64, int, dfd, const char __user *, filename,
656 struct stat64 __user *, statbu 509 struct stat64 __user *, statbuf, int, flag)
657 { 510 {
658 struct kstat stat; 511 struct kstat stat;
659 int error; 512 int error;
660 513
661 error = vfs_fstatat(dfd, filename, &st 514 error = vfs_fstatat(dfd, filename, &stat, flag);
662 if (error) 515 if (error)
663 return error; 516 return error;
664 return cp_new_stat64(&stat, statbuf); 517 return cp_new_stat64(&stat, statbuf);
665 } 518 }
666 #endif /* __ARCH_WANT_STAT64 || __ARCH_WANT_CO 519 #endif /* __ARCH_WANT_STAT64 || __ARCH_WANT_COMPAT_STAT64 */
667 520
668 static noinline_for_stack int 521 static noinline_for_stack int
669 cp_statx(const struct kstat *stat, struct stat 522 cp_statx(const struct kstat *stat, struct statx __user *buffer)
670 { 523 {
671 struct statx tmp; 524 struct statx tmp;
672 525
673 memset(&tmp, 0, sizeof(tmp)); 526 memset(&tmp, 0, sizeof(tmp));
674 527
675 /* STATX_CHANGE_COOKIE is kernel-only !! 528 tmp.stx_mask = stat->result_mask;
676 tmp.stx_mask = stat->result_mask & ~ST <<
677 tmp.stx_blksize = stat->blksize; 529 tmp.stx_blksize = stat->blksize;
678 /* STATX_ATTR_CHANGE_MONOTONIC is kern !! 530 tmp.stx_attributes = stat->attributes;
679 tmp.stx_attributes = stat->attributes <<
680 tmp.stx_nlink = stat->nlink; 531 tmp.stx_nlink = stat->nlink;
681 tmp.stx_uid = from_kuid_munged(current 532 tmp.stx_uid = from_kuid_munged(current_user_ns(), stat->uid);
682 tmp.stx_gid = from_kgid_munged(current 533 tmp.stx_gid = from_kgid_munged(current_user_ns(), stat->gid);
683 tmp.stx_mode = stat->mode; 534 tmp.stx_mode = stat->mode;
684 tmp.stx_ino = stat->ino; 535 tmp.stx_ino = stat->ino;
685 tmp.stx_size = stat->size; 536 tmp.stx_size = stat->size;
686 tmp.stx_blocks = stat->blocks; 537 tmp.stx_blocks = stat->blocks;
687 tmp.stx_attributes_mask = stat->attrib 538 tmp.stx_attributes_mask = stat->attributes_mask;
688 tmp.stx_atime.tv_sec = stat->atime.tv_ 539 tmp.stx_atime.tv_sec = stat->atime.tv_sec;
689 tmp.stx_atime.tv_nsec = stat->atime.tv 540 tmp.stx_atime.tv_nsec = stat->atime.tv_nsec;
690 tmp.stx_btime.tv_sec = stat->btime.tv_ 541 tmp.stx_btime.tv_sec = stat->btime.tv_sec;
691 tmp.stx_btime.tv_nsec = stat->btime.tv 542 tmp.stx_btime.tv_nsec = stat->btime.tv_nsec;
692 tmp.stx_ctime.tv_sec = stat->ctime.tv_ 543 tmp.stx_ctime.tv_sec = stat->ctime.tv_sec;
693 tmp.stx_ctime.tv_nsec = stat->ctime.tv 544 tmp.stx_ctime.tv_nsec = stat->ctime.tv_nsec;
694 tmp.stx_mtime.tv_sec = stat->mtime.tv_ 545 tmp.stx_mtime.tv_sec = stat->mtime.tv_sec;
695 tmp.stx_mtime.tv_nsec = stat->mtime.tv 546 tmp.stx_mtime.tv_nsec = stat->mtime.tv_nsec;
696 tmp.stx_rdev_major = MAJOR(stat->rdev) 547 tmp.stx_rdev_major = MAJOR(stat->rdev);
697 tmp.stx_rdev_minor = MINOR(stat->rdev) 548 tmp.stx_rdev_minor = MINOR(stat->rdev);
698 tmp.stx_dev_major = MAJOR(stat->dev); 549 tmp.stx_dev_major = MAJOR(stat->dev);
699 tmp.stx_dev_minor = MINOR(stat->dev); 550 tmp.stx_dev_minor = MINOR(stat->dev);
700 tmp.stx_mnt_id = stat->mnt_id; <<
701 tmp.stx_dio_mem_align = stat->dio_mem_ <<
702 tmp.stx_dio_offset_align = stat->dio_o <<
703 tmp.stx_subvol = stat->subvol; <<
704 tmp.stx_atomic_write_unit_min = stat-> <<
705 tmp.stx_atomic_write_unit_max = stat-> <<
706 tmp.stx_atomic_write_segments_max = st <<
707 551
708 return copy_to_user(buffer, &tmp, size 552 return copy_to_user(buffer, &tmp, sizeof(tmp)) ? -EFAULT : 0;
709 } 553 }
710 554
711 int do_statx(int dfd, struct filename *filenam <<
712 unsigned int mask, struct statx _ <<
713 { <<
714 struct kstat stat; <<
715 int error; <<
716 <<
717 if (mask & STATX__RESERVED) <<
718 return -EINVAL; <<
719 if ((flags & AT_STATX_SYNC_TYPE) == AT <<
720 return -EINVAL; <<
721 <<
722 /* <<
723 * STATX_CHANGE_COOKIE is kernel-only <<
724 * from userland. <<
725 */ <<
726 mask &= ~STATX_CHANGE_COOKIE; <<
727 <<
728 error = vfs_statx(dfd, filename, flags <<
729 if (error) <<
730 return error; <<
731 <<
732 return cp_statx(&stat, buffer); <<
733 } <<
734 <<
735 int do_statx_fd(int fd, unsigned int flags, un <<
736 struct statx __user *buffer) <<
737 { <<
738 struct kstat stat; <<
739 int error; <<
740 <<
741 if (mask & STATX__RESERVED) <<
742 return -EINVAL; <<
743 if ((flags & AT_STATX_SYNC_TYPE) == AT <<
744 return -EINVAL; <<
745 <<
746 /* <<
747 * STATX_CHANGE_COOKIE is kernel-only <<
748 * from userland. <<
749 */ <<
750 mask &= ~STATX_CHANGE_COOKIE; <<
751 <<
752 error = vfs_statx_fd(fd, flags, &stat, <<
753 if (error) <<
754 return error; <<
755 <<
756 return cp_statx(&stat, buffer); <<
757 } <<
758 <<
759 /** 555 /**
760 * sys_statx - System call to get enhanced sta 556 * sys_statx - System call to get enhanced stats
761 * @dfd: Base directory to pathwalk from *or* 557 * @dfd: Base directory to pathwalk from *or* fd to stat.
762 * @filename: File to stat or either NULL or " !! 558 * @filename: File to stat or "" with AT_EMPTY_PATH
763 * @flags: AT_* flags to control pathwalk. 559 * @flags: AT_* flags to control pathwalk.
764 * @mask: Parts of statx struct actually requi 560 * @mask: Parts of statx struct actually required.
765 * @buffer: Result buffer. 561 * @buffer: Result buffer.
766 * 562 *
767 * Note that fstat() can be emulated by settin 563 * Note that fstat() can be emulated by setting dfd to the fd of interest,
768 * supplying "" (or preferably NULL) as the fi !! 564 * supplying "" as the filename and setting AT_EMPTY_PATH in the flags.
769 * in the flags. <<
770 */ 565 */
771 SYSCALL_DEFINE5(statx, 566 SYSCALL_DEFINE5(statx,
772 int, dfd, const char __user *, 567 int, dfd, const char __user *, filename, unsigned, flags,
773 unsigned int, mask, 568 unsigned int, mask,
774 struct statx __user *, buffer) 569 struct statx __user *, buffer)
775 { 570 {
776 int ret; !! 571 struct kstat stat;
777 unsigned lflags; !! 572 int error;
778 struct filename *name; <<
779 <<
780 /* <<
781 * Short-circuit handling of NULL and <<
782 * <<
783 * For a NULL path we require and acce <<
784 * (possibly |'d with AT_STATX flags). <<
785 * <<
786 * However, glibc on 32-bit architectu <<
787 * with the "" pathname and AT_NO_AUTO <<
788 * Supporting this results in the ugli <<
789 */ <<
790 lflags = flags & ~(AT_NO_AUTOMOUNT | A <<
791 if (lflags == AT_EMPTY_PATH && vfs_emp <<
792 return do_statx_fd(dfd, flags <<
793 <<
794 name = getname_flags(filename, getname <<
795 ret = do_statx(dfd, name, flags, mask, <<
796 putname(name); <<
797 573
798 return ret; !! 574 if (mask & STATX__RESERVED)
>> 575 return -EINVAL;
>> 576 if ((flags & AT_STATX_SYNC_TYPE) == AT_STATX_SYNC_TYPE)
>> 577 return -EINVAL;
>> 578
>> 579 error = vfs_statx(dfd, filename, flags, &stat, mask);
>> 580 if (error)
>> 581 return error;
>> 582
>> 583 return cp_statx(&stat, buffer);
799 } 584 }
800 585
801 #if defined(CONFIG_COMPAT) && defined(__ARCH_W !! 586 #ifdef CONFIG_COMPAT
802 static int cp_compat_stat(struct kstat *stat, 587 static int cp_compat_stat(struct kstat *stat, struct compat_stat __user *ubuf)
803 { 588 {
804 struct compat_stat tmp; 589 struct compat_stat tmp;
805 590
806 if (sizeof(tmp.st_dev) < 4 && !old_val !! 591 if (!old_valid_dev(stat->dev) || !old_valid_dev(stat->rdev))
807 return -EOVERFLOW; <<
808 if (sizeof(tmp.st_rdev) < 4 && !old_va <<
809 return -EOVERFLOW; 592 return -EOVERFLOW;
810 593
811 memset(&tmp, 0, sizeof(tmp)); 594 memset(&tmp, 0, sizeof(tmp));
812 tmp.st_dev = new_encode_dev(stat->dev) !! 595 tmp.st_dev = old_encode_dev(stat->dev);
813 tmp.st_ino = stat->ino; 596 tmp.st_ino = stat->ino;
814 if (sizeof(tmp.st_ino) < sizeof(stat-> 597 if (sizeof(tmp.st_ino) < sizeof(stat->ino) && tmp.st_ino != stat->ino)
815 return -EOVERFLOW; 598 return -EOVERFLOW;
816 tmp.st_mode = stat->mode; 599 tmp.st_mode = stat->mode;
817 tmp.st_nlink = stat->nlink; 600 tmp.st_nlink = stat->nlink;
818 if (tmp.st_nlink != stat->nlink) 601 if (tmp.st_nlink != stat->nlink)
819 return -EOVERFLOW; 602 return -EOVERFLOW;
820 SET_UID(tmp.st_uid, from_kuid_munged(c 603 SET_UID(tmp.st_uid, from_kuid_munged(current_user_ns(), stat->uid));
821 SET_GID(tmp.st_gid, from_kgid_munged(c 604 SET_GID(tmp.st_gid, from_kgid_munged(current_user_ns(), stat->gid));
822 tmp.st_rdev = new_encode_dev(stat->rde !! 605 tmp.st_rdev = old_encode_dev(stat->rdev);
823 if ((u64) stat->size > MAX_NON_LFS) 606 if ((u64) stat->size > MAX_NON_LFS)
824 return -EOVERFLOW; 607 return -EOVERFLOW;
825 tmp.st_size = stat->size; 608 tmp.st_size = stat->size;
826 tmp.st_atime = stat->atime.tv_sec; 609 tmp.st_atime = stat->atime.tv_sec;
827 tmp.st_atime_nsec = stat->atime.tv_nse 610 tmp.st_atime_nsec = stat->atime.tv_nsec;
828 tmp.st_mtime = stat->mtime.tv_sec; 611 tmp.st_mtime = stat->mtime.tv_sec;
829 tmp.st_mtime_nsec = stat->mtime.tv_nse 612 tmp.st_mtime_nsec = stat->mtime.tv_nsec;
830 tmp.st_ctime = stat->ctime.tv_sec; 613 tmp.st_ctime = stat->ctime.tv_sec;
831 tmp.st_ctime_nsec = stat->ctime.tv_nse 614 tmp.st_ctime_nsec = stat->ctime.tv_nsec;
832 tmp.st_blocks = stat->blocks; 615 tmp.st_blocks = stat->blocks;
833 tmp.st_blksize = stat->blksize; 616 tmp.st_blksize = stat->blksize;
834 return copy_to_user(ubuf, &tmp, sizeof 617 return copy_to_user(ubuf, &tmp, sizeof(tmp)) ? -EFAULT : 0;
835 } 618 }
836 619
837 COMPAT_SYSCALL_DEFINE2(newstat, const char __u 620 COMPAT_SYSCALL_DEFINE2(newstat, const char __user *, filename,
838 struct compat_stat __us 621 struct compat_stat __user *, statbuf)
839 { 622 {
840 struct kstat stat; 623 struct kstat stat;
841 int error; 624 int error;
842 625
843 error = vfs_stat(filename, &stat); 626 error = vfs_stat(filename, &stat);
844 if (error) 627 if (error)
845 return error; 628 return error;
846 return cp_compat_stat(&stat, statbuf); 629 return cp_compat_stat(&stat, statbuf);
847 } 630 }
848 631
849 COMPAT_SYSCALL_DEFINE2(newlstat, const char __ 632 COMPAT_SYSCALL_DEFINE2(newlstat, const char __user *, filename,
850 struct compat_stat __us 633 struct compat_stat __user *, statbuf)
851 { 634 {
852 struct kstat stat; 635 struct kstat stat;
853 int error; 636 int error;
854 637
855 error = vfs_lstat(filename, &stat); 638 error = vfs_lstat(filename, &stat);
856 if (error) 639 if (error)
857 return error; 640 return error;
858 return cp_compat_stat(&stat, statbuf); 641 return cp_compat_stat(&stat, statbuf);
859 } 642 }
860 643
861 #ifndef __ARCH_WANT_STAT64 644 #ifndef __ARCH_WANT_STAT64
862 COMPAT_SYSCALL_DEFINE4(newfstatat, unsigned in 645 COMPAT_SYSCALL_DEFINE4(newfstatat, unsigned int, dfd,
863 const char __user *, fi 646 const char __user *, filename,
864 struct compat_stat __us 647 struct compat_stat __user *, statbuf, int, flag)
865 { 648 {
866 struct kstat stat; 649 struct kstat stat;
867 int error; 650 int error;
868 651
869 error = vfs_fstatat(dfd, filename, &st 652 error = vfs_fstatat(dfd, filename, &stat, flag);
870 if (error) 653 if (error)
871 return error; 654 return error;
872 return cp_compat_stat(&stat, statbuf); 655 return cp_compat_stat(&stat, statbuf);
873 } 656 }
874 #endif 657 #endif
875 658
876 COMPAT_SYSCALL_DEFINE2(newfstat, unsigned int, 659 COMPAT_SYSCALL_DEFINE2(newfstat, unsigned int, fd,
877 struct compat_stat __us 660 struct compat_stat __user *, statbuf)
878 { 661 {
879 struct kstat stat; 662 struct kstat stat;
880 int error = vfs_fstat(fd, &stat); 663 int error = vfs_fstat(fd, &stat);
881 664
882 if (!error) 665 if (!error)
883 error = cp_compat_stat(&stat, 666 error = cp_compat_stat(&stat, statbuf);
884 return error; 667 return error;
885 } 668 }
886 #endif 669 #endif
887 670
888 /* Caller is here responsible for sufficient l 671 /* Caller is here responsible for sufficient locking (ie. inode->i_lock) */
889 void __inode_add_bytes(struct inode *inode, lo 672 void __inode_add_bytes(struct inode *inode, loff_t bytes)
890 { 673 {
891 inode->i_blocks += bytes >> 9; 674 inode->i_blocks += bytes >> 9;
892 bytes &= 511; 675 bytes &= 511;
893 inode->i_bytes += bytes; 676 inode->i_bytes += bytes;
894 if (inode->i_bytes >= 512) { 677 if (inode->i_bytes >= 512) {
895 inode->i_blocks++; 678 inode->i_blocks++;
896 inode->i_bytes -= 512; 679 inode->i_bytes -= 512;
897 } 680 }
898 } 681 }
899 EXPORT_SYMBOL(__inode_add_bytes); 682 EXPORT_SYMBOL(__inode_add_bytes);
900 683
901 void inode_add_bytes(struct inode *inode, loff 684 void inode_add_bytes(struct inode *inode, loff_t bytes)
902 { 685 {
903 spin_lock(&inode->i_lock); 686 spin_lock(&inode->i_lock);
904 __inode_add_bytes(inode, bytes); 687 __inode_add_bytes(inode, bytes);
905 spin_unlock(&inode->i_lock); 688 spin_unlock(&inode->i_lock);
906 } 689 }
907 690
908 EXPORT_SYMBOL(inode_add_bytes); 691 EXPORT_SYMBOL(inode_add_bytes);
909 692
910 void __inode_sub_bytes(struct inode *inode, lo 693 void __inode_sub_bytes(struct inode *inode, loff_t bytes)
911 { 694 {
912 inode->i_blocks -= bytes >> 9; 695 inode->i_blocks -= bytes >> 9;
913 bytes &= 511; 696 bytes &= 511;
914 if (inode->i_bytes < bytes) { 697 if (inode->i_bytes < bytes) {
915 inode->i_blocks--; 698 inode->i_blocks--;
916 inode->i_bytes += 512; 699 inode->i_bytes += 512;
917 } 700 }
918 inode->i_bytes -= bytes; 701 inode->i_bytes -= bytes;
919 } 702 }
920 703
921 EXPORT_SYMBOL(__inode_sub_bytes); 704 EXPORT_SYMBOL(__inode_sub_bytes);
922 705
923 void inode_sub_bytes(struct inode *inode, loff 706 void inode_sub_bytes(struct inode *inode, loff_t bytes)
924 { 707 {
925 spin_lock(&inode->i_lock); 708 spin_lock(&inode->i_lock);
926 __inode_sub_bytes(inode, bytes); 709 __inode_sub_bytes(inode, bytes);
927 spin_unlock(&inode->i_lock); 710 spin_unlock(&inode->i_lock);
928 } 711 }
929 712
930 EXPORT_SYMBOL(inode_sub_bytes); 713 EXPORT_SYMBOL(inode_sub_bytes);
931 714
932 loff_t inode_get_bytes(struct inode *inode) 715 loff_t inode_get_bytes(struct inode *inode)
933 { 716 {
934 loff_t ret; 717 loff_t ret;
935 718
936 spin_lock(&inode->i_lock); 719 spin_lock(&inode->i_lock);
937 ret = __inode_get_bytes(inode); 720 ret = __inode_get_bytes(inode);
938 spin_unlock(&inode->i_lock); 721 spin_unlock(&inode->i_lock);
939 return ret; 722 return ret;
940 } 723 }
941 724
942 EXPORT_SYMBOL(inode_get_bytes); 725 EXPORT_SYMBOL(inode_get_bytes);
943 726
944 void inode_set_bytes(struct inode *inode, loff 727 void inode_set_bytes(struct inode *inode, loff_t bytes)
945 { 728 {
946 /* Caller is here responsible for suff 729 /* Caller is here responsible for sufficient locking
947 * (ie. inode->i_lock) */ 730 * (ie. inode->i_lock) */
948 inode->i_blocks = bytes >> 9; 731 inode->i_blocks = bytes >> 9;
949 inode->i_bytes = bytes & 511; 732 inode->i_bytes = bytes & 511;
950 } 733 }
951 734
952 EXPORT_SYMBOL(inode_set_bytes); 735 EXPORT_SYMBOL(inode_set_bytes);
953 736
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.