Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull misc final vfs updates from Al Viro: "A few unrelated patches that got beating in -next. Everything else will have to go into the next window ;-/" * 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: hfs: fix hfs_readdir() selftest for default_file_splice_read() infoleak 9p: constify ->d_name handling
This commit is contained in:
commit
0710f3ff91
10
fs/9p/fid.c
10
fs/9p/fid.c
|
@ -91,10 +91,10 @@ static struct p9_fid *v9fs_fid_find(struct dentry *dentry, kuid_t uid, int any)
|
|||
* dentry names.
|
||||
*/
|
||||
static int build_path_from_dentry(struct v9fs_session_info *v9ses,
|
||||
struct dentry *dentry, char ***names)
|
||||
struct dentry *dentry, const unsigned char ***names)
|
||||
{
|
||||
int n = 0, i;
|
||||
char **wnames;
|
||||
const unsigned char **wnames;
|
||||
struct dentry *ds;
|
||||
|
||||
for (ds = dentry; !IS_ROOT(ds); ds = ds->d_parent)
|
||||
|
@ -105,7 +105,7 @@ static int build_path_from_dentry(struct v9fs_session_info *v9ses,
|
|||
goto err_out;
|
||||
|
||||
for (ds = dentry, i = (n-1); i >= 0; i--, ds = ds->d_parent)
|
||||
wnames[i] = (char *)ds->d_name.name;
|
||||
wnames[i] = ds->d_name.name;
|
||||
|
||||
*names = wnames;
|
||||
return n;
|
||||
|
@ -117,7 +117,7 @@ static struct p9_fid *v9fs_fid_lookup_with_uid(struct dentry *dentry,
|
|||
kuid_t uid, int any)
|
||||
{
|
||||
struct dentry *ds;
|
||||
char **wnames, *uname;
|
||||
const unsigned char **wnames, *uname;
|
||||
int i, n, l, clone, access;
|
||||
struct v9fs_session_info *v9ses;
|
||||
struct p9_fid *fid, *old_fid = NULL;
|
||||
|
@ -137,7 +137,7 @@ static struct p9_fid *v9fs_fid_lookup_with_uid(struct dentry *dentry,
|
|||
fid = v9fs_fid_find(ds, uid, any);
|
||||
if (fid) {
|
||||
/* Found the parent fid do a lookup with that */
|
||||
fid = p9_client_walk(fid, 1, (char **)&dentry->d_name.name, 1);
|
||||
fid = p9_client_walk(fid, 1, &dentry->d_name.name, 1);
|
||||
goto fid_out;
|
||||
}
|
||||
up_read(&v9ses->rename_sem);
|
||||
|
|
|
@ -643,7 +643,7 @@ v9fs_create(struct v9fs_session_info *v9ses, struct inode *dir,
|
|||
struct dentry *dentry, char *extension, u32 perm, u8 mode)
|
||||
{
|
||||
int err;
|
||||
char *name;
|
||||
const unsigned char *name;
|
||||
struct p9_fid *dfid, *ofid, *fid;
|
||||
struct inode *inode;
|
||||
|
||||
|
@ -652,7 +652,7 @@ v9fs_create(struct v9fs_session_info *v9ses, struct inode *dir,
|
|||
err = 0;
|
||||
ofid = NULL;
|
||||
fid = NULL;
|
||||
name = (char *) dentry->d_name.name;
|
||||
name = dentry->d_name.name;
|
||||
dfid = v9fs_parent_fid(dentry);
|
||||
if (IS_ERR(dfid)) {
|
||||
err = PTR_ERR(dfid);
|
||||
|
@ -788,7 +788,7 @@ struct dentry *v9fs_vfs_lookup(struct inode *dir, struct dentry *dentry,
|
|||
struct v9fs_session_info *v9ses;
|
||||
struct p9_fid *dfid, *fid;
|
||||
struct inode *inode;
|
||||
char *name;
|
||||
const unsigned char *name;
|
||||
|
||||
p9_debug(P9_DEBUG_VFS, "dir: %p dentry: (%pd) %p flags: %x\n",
|
||||
dir, dentry, dentry, flags);
|
||||
|
@ -802,7 +802,7 @@ struct dentry *v9fs_vfs_lookup(struct inode *dir, struct dentry *dentry,
|
|||
if (IS_ERR(dfid))
|
||||
return ERR_CAST(dfid);
|
||||
|
||||
name = (char *) dentry->d_name.name;
|
||||
name = dentry->d_name.name;
|
||||
fid = p9_client_walk(dfid, 1, &name, 1);
|
||||
if (IS_ERR(fid)) {
|
||||
if (fid == ERR_PTR(-ENOENT)) {
|
||||
|
@ -1012,7 +1012,7 @@ v9fs_vfs_rename(struct inode *old_dir, struct dentry *old_dentry,
|
|||
}
|
||||
v9fs_blank_wstat(&wstat);
|
||||
wstat.muid = v9ses->uname;
|
||||
wstat.name = (char *) new_dentry->d_name.name;
|
||||
wstat.name = new_dentry->d_name.name;
|
||||
retval = p9_client_wstat(oldfid, &wstat);
|
||||
|
||||
clunk_newdir:
|
||||
|
|
|
@ -244,7 +244,7 @@ v9fs_vfs_atomic_open_dotl(struct inode *dir, struct dentry *dentry,
|
|||
int err = 0;
|
||||
kgid_t gid;
|
||||
umode_t mode;
|
||||
char *name = NULL;
|
||||
const unsigned char *name = NULL;
|
||||
struct p9_qid qid;
|
||||
struct inode *inode;
|
||||
struct p9_fid *fid = NULL;
|
||||
|
@ -269,7 +269,7 @@ v9fs_vfs_atomic_open_dotl(struct inode *dir, struct dentry *dentry,
|
|||
|
||||
v9ses = v9fs_inode2v9ses(dir);
|
||||
|
||||
name = (char *) dentry->d_name.name;
|
||||
name = dentry->d_name.name;
|
||||
p9_debug(P9_DEBUG_VFS, "name:%s flags:0x%x mode:0x%hx\n",
|
||||
name, flags, omode);
|
||||
|
||||
|
@ -385,7 +385,7 @@ static int v9fs_vfs_mkdir_dotl(struct inode *dir,
|
|||
struct v9fs_session_info *v9ses;
|
||||
struct p9_fid *fid = NULL, *dfid = NULL;
|
||||
kgid_t gid;
|
||||
char *name;
|
||||
const unsigned char *name;
|
||||
umode_t mode;
|
||||
struct inode *inode;
|
||||
struct p9_qid qid;
|
||||
|
@ -416,7 +416,7 @@ static int v9fs_vfs_mkdir_dotl(struct inode *dir,
|
|||
err);
|
||||
goto error;
|
||||
}
|
||||
name = (char *) dentry->d_name.name;
|
||||
name = dentry->d_name.name;
|
||||
err = p9_client_mkdir_dotl(dfid, name, mode, gid, &qid);
|
||||
if (err < 0)
|
||||
goto error;
|
||||
|
@ -679,14 +679,14 @@ v9fs_vfs_symlink_dotl(struct inode *dir, struct dentry *dentry,
|
|||
{
|
||||
int err;
|
||||
kgid_t gid;
|
||||
char *name;
|
||||
const unsigned char *name;
|
||||
struct p9_qid qid;
|
||||
struct inode *inode;
|
||||
struct p9_fid *dfid;
|
||||
struct p9_fid *fid = NULL;
|
||||
struct v9fs_session_info *v9ses;
|
||||
|
||||
name = (char *) dentry->d_name.name;
|
||||
name = dentry->d_name.name;
|
||||
p9_debug(P9_DEBUG_VFS, "%lu,%s,%s\n", dir->i_ino, name, symname);
|
||||
v9ses = v9fs_inode2v9ses(dir);
|
||||
|
||||
|
@ -700,7 +700,7 @@ v9fs_vfs_symlink_dotl(struct inode *dir, struct dentry *dentry,
|
|||
gid = v9fs_get_fsgid_for_create(dir);
|
||||
|
||||
/* Server doesn't alter fid on TSYMLINK. Hence no need to clone it. */
|
||||
err = p9_client_symlink(dfid, name, (char *)symname, gid, &qid);
|
||||
err = p9_client_symlink(dfid, name, symname, gid, &qid);
|
||||
|
||||
if (err < 0) {
|
||||
p9_debug(P9_DEBUG_VFS, "p9_client_symlink failed %d\n", err);
|
||||
|
@ -776,7 +776,7 @@ v9fs_vfs_link_dotl(struct dentry *old_dentry, struct inode *dir,
|
|||
if (IS_ERR(oldfid))
|
||||
return PTR_ERR(oldfid);
|
||||
|
||||
err = p9_client_link(dfid, oldfid, (char *)dentry->d_name.name);
|
||||
err = p9_client_link(dfid, oldfid, dentry->d_name.name);
|
||||
|
||||
if (err < 0) {
|
||||
p9_debug(P9_DEBUG_VFS, "p9_client_link failed %d\n", err);
|
||||
|
@ -813,7 +813,7 @@ v9fs_vfs_mknod_dotl(struct inode *dir, struct dentry *dentry, umode_t omode,
|
|||
{
|
||||
int err;
|
||||
kgid_t gid;
|
||||
char *name;
|
||||
const unsigned char *name;
|
||||
umode_t mode;
|
||||
struct v9fs_session_info *v9ses;
|
||||
struct p9_fid *fid = NULL, *dfid = NULL;
|
||||
|
@ -843,7 +843,7 @@ v9fs_vfs_mknod_dotl(struct inode *dir, struct dentry *dentry, umode_t omode,
|
|||
err);
|
||||
goto error;
|
||||
}
|
||||
name = (char *) dentry->d_name.name;
|
||||
name = dentry->d_name.name;
|
||||
|
||||
err = p9_client_mknod_dotl(dfid, name, mode, rdev, gid, &qid);
|
||||
if (err < 0)
|
||||
|
|
|
@ -169,7 +169,7 @@ static int hfs_readdir(struct file *file, struct dir_context *ctx)
|
|||
* Can be done after the list insertion; exclusion with
|
||||
* hfs_delete_cat() is provided by directory lock.
|
||||
*/
|
||||
memcpy(&rd->key, &fd.key, sizeof(struct hfs_cat_key));
|
||||
memcpy(&rd->key, &fd.key->cat, sizeof(struct hfs_cat_key));
|
||||
out:
|
||||
hfs_find_exit(&fd);
|
||||
return err;
|
||||
|
|
|
@ -402,10 +402,10 @@ struct p9_wstat {
|
|||
u32 atime;
|
||||
u32 mtime;
|
||||
u64 length;
|
||||
char *name;
|
||||
char *uid;
|
||||
char *gid;
|
||||
char *muid;
|
||||
const char *name;
|
||||
const char *uid;
|
||||
const char *gid;
|
||||
const char *muid;
|
||||
char *extension; /* 9p2000.u extensions */
|
||||
kuid_t n_uid; /* 9p2000.u extensions */
|
||||
kgid_t n_gid; /* 9p2000.u extensions */
|
||||
|
|
|
@ -223,16 +223,16 @@ void p9_client_destroy(struct p9_client *clnt);
|
|||
void p9_client_disconnect(struct p9_client *clnt);
|
||||
void p9_client_begin_disconnect(struct p9_client *clnt);
|
||||
struct p9_fid *p9_client_attach(struct p9_client *clnt, struct p9_fid *afid,
|
||||
char *uname, kuid_t n_uname, char *aname);
|
||||
const char *uname, kuid_t n_uname, const char *aname);
|
||||
struct p9_fid *p9_client_walk(struct p9_fid *oldfid, uint16_t nwname,
|
||||
char **wnames, int clone);
|
||||
const unsigned char * const *wnames, int clone);
|
||||
int p9_client_open(struct p9_fid *fid, int mode);
|
||||
int p9_client_fcreate(struct p9_fid *fid, char *name, u32 perm, int mode,
|
||||
int p9_client_fcreate(struct p9_fid *fid, const char *name, u32 perm, int mode,
|
||||
char *extension);
|
||||
int p9_client_link(struct p9_fid *fid, struct p9_fid *oldfid, char *newname);
|
||||
int p9_client_symlink(struct p9_fid *fid, char *name, char *symname, kgid_t gid,
|
||||
struct p9_qid *qid);
|
||||
int p9_client_create_dotl(struct p9_fid *ofid, char *name, u32 flags, u32 mode,
|
||||
int p9_client_link(struct p9_fid *fid, struct p9_fid *oldfid, const char *newname);
|
||||
int p9_client_symlink(struct p9_fid *fid, const char *name, const char *symname,
|
||||
kgid_t gid, struct p9_qid *qid);
|
||||
int p9_client_create_dotl(struct p9_fid *ofid, const char *name, u32 flags, u32 mode,
|
||||
kgid_t gid, struct p9_qid *qid);
|
||||
int p9_client_clunk(struct p9_fid *fid);
|
||||
int p9_client_fsync(struct p9_fid *fid, int datasync);
|
||||
|
@ -250,9 +250,9 @@ int p9_client_setattr(struct p9_fid *fid, struct p9_iattr_dotl *attr);
|
|||
struct p9_stat_dotl *p9_client_getattr_dotl(struct p9_fid *fid,
|
||||
u64 request_mask);
|
||||
|
||||
int p9_client_mknod_dotl(struct p9_fid *oldfid, char *name, int mode,
|
||||
int p9_client_mknod_dotl(struct p9_fid *oldfid, const char *name, int mode,
|
||||
dev_t rdev, kgid_t gid, struct p9_qid *);
|
||||
int p9_client_mkdir_dotl(struct p9_fid *fid, char *name, int mode,
|
||||
int p9_client_mkdir_dotl(struct p9_fid *fid, const char *name, int mode,
|
||||
kgid_t gid, struct p9_qid *);
|
||||
int p9_client_lock_dotl(struct p9_fid *fid, struct p9_flock *flock, u8 *status);
|
||||
int p9_client_getlock_dotl(struct p9_fid *fid, struct p9_getlock *fl);
|
||||
|
|
|
@ -1101,7 +1101,7 @@ void p9_client_begin_disconnect(struct p9_client *clnt)
|
|||
EXPORT_SYMBOL(p9_client_begin_disconnect);
|
||||
|
||||
struct p9_fid *p9_client_attach(struct p9_client *clnt, struct p9_fid *afid,
|
||||
char *uname, kuid_t n_uname, char *aname)
|
||||
const char *uname, kuid_t n_uname, const char *aname)
|
||||
{
|
||||
int err = 0;
|
||||
struct p9_req_t *req;
|
||||
|
@ -1149,7 +1149,7 @@ error:
|
|||
EXPORT_SYMBOL(p9_client_attach);
|
||||
|
||||
struct p9_fid *p9_client_walk(struct p9_fid *oldfid, uint16_t nwname,
|
||||
char **wnames, int clone)
|
||||
const unsigned char * const *wnames, int clone)
|
||||
{
|
||||
int err;
|
||||
struct p9_client *clnt;
|
||||
|
@ -1271,7 +1271,7 @@ error:
|
|||
}
|
||||
EXPORT_SYMBOL(p9_client_open);
|
||||
|
||||
int p9_client_create_dotl(struct p9_fid *ofid, char *name, u32 flags, u32 mode,
|
||||
int p9_client_create_dotl(struct p9_fid *ofid, const char *name, u32 flags, u32 mode,
|
||||
kgid_t gid, struct p9_qid *qid)
|
||||
{
|
||||
int err = 0;
|
||||
|
@ -1316,7 +1316,7 @@ error:
|
|||
}
|
||||
EXPORT_SYMBOL(p9_client_create_dotl);
|
||||
|
||||
int p9_client_fcreate(struct p9_fid *fid, char *name, u32 perm, int mode,
|
||||
int p9_client_fcreate(struct p9_fid *fid, const char *name, u32 perm, int mode,
|
||||
char *extension)
|
||||
{
|
||||
int err;
|
||||
|
@ -1361,8 +1361,8 @@ error:
|
|||
}
|
||||
EXPORT_SYMBOL(p9_client_fcreate);
|
||||
|
||||
int p9_client_symlink(struct p9_fid *dfid, char *name, char *symtgt, kgid_t gid,
|
||||
struct p9_qid *qid)
|
||||
int p9_client_symlink(struct p9_fid *dfid, const char *name,
|
||||
const char *symtgt, kgid_t gid, struct p9_qid *qid)
|
||||
{
|
||||
int err = 0;
|
||||
struct p9_client *clnt;
|
||||
|
@ -1395,7 +1395,7 @@ error:
|
|||
}
|
||||
EXPORT_SYMBOL(p9_client_symlink);
|
||||
|
||||
int p9_client_link(struct p9_fid *dfid, struct p9_fid *oldfid, char *newname)
|
||||
int p9_client_link(struct p9_fid *dfid, struct p9_fid *oldfid, const char *newname)
|
||||
{
|
||||
struct p9_client *clnt;
|
||||
struct p9_req_t *req;
|
||||
|
@ -2117,7 +2117,7 @@ error:
|
|||
}
|
||||
EXPORT_SYMBOL(p9_client_readdir);
|
||||
|
||||
int p9_client_mknod_dotl(struct p9_fid *fid, char *name, int mode,
|
||||
int p9_client_mknod_dotl(struct p9_fid *fid, const char *name, int mode,
|
||||
dev_t rdev, kgid_t gid, struct p9_qid *qid)
|
||||
{
|
||||
int err;
|
||||
|
@ -2148,7 +2148,7 @@ error:
|
|||
}
|
||||
EXPORT_SYMBOL(p9_client_mknod_dotl);
|
||||
|
||||
int p9_client_mkdir_dotl(struct p9_fid *fid, char *name, int mode,
|
||||
int p9_client_mkdir_dotl(struct p9_fid *fid, const char *name, int mode,
|
||||
kgid_t gid, struct p9_qid *qid)
|
||||
{
|
||||
int err;
|
||||
|
|
|
@ -26,6 +26,7 @@ TARGETS += ptrace
|
|||
TARGETS += seccomp
|
||||
TARGETS += sigaltstack
|
||||
TARGETS += size
|
||||
TARGETS += splice
|
||||
TARGETS += static_keys
|
||||
TARGETS += sync
|
||||
TARGETS += sysctl
|
||||
|
|
8
tools/testing/selftests/splice/Makefile
Normal file
8
tools/testing/selftests/splice/Makefile
Normal file
|
@ -0,0 +1,8 @@
|
|||
TEST_PROGS := default_file_splice_read.sh
|
||||
EXTRA := default_file_splice_read
|
||||
all: $(TEST_PROGS) $(EXTRA)
|
||||
|
||||
include ../lib.mk
|
||||
|
||||
clean:
|
||||
rm -fr $(TEST_PROGS) $(EXTRA)
|
|
@ -0,0 +1,8 @@
|
|||
#define _GNU_SOURCE
|
||||
#include <fcntl.h>
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
splice(0, 0, 1, 0, 1<<30, 0);
|
||||
return 0;
|
||||
}
|
7
tools/testing/selftests/splice/default_file_splice_read.sh
Executable file
7
tools/testing/selftests/splice/default_file_splice_read.sh
Executable file
|
@ -0,0 +1,7 @@
|
|||
#!/bin/sh
|
||||
n=`./default_file_splice_read </dev/null | wc -c`
|
||||
|
||||
test "$n" = 0 && exit 0
|
||||
|
||||
echo "default_file_splice_read broken: leaked $n"
|
||||
exit 1
|
Loading…
Reference in a new issue