Commit fbfd64d2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'vfs-6.13-rc7.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs 

Pull vfs fixes from Christian Brauner:

 - Relax assertions on failure to encode file handles

   The ->encode_fh() method can fail for various reasons. None of them
   warrant a WARN_ON().

 - Fix overlayfs file handle encoding by allowing encoding an fid from
   an inode without an alias

 - Make sure fuse_dir_open() handles FOPEN_KEEP_CACHE. If it's not
   specified fuse needs to invaludate the directory inode page cache

 - Fix qnx6 so it builds with gcc-15

 - Various fixes for netfslib and ceph and nfs filesystems:
     - Ignore silly rename files from afs and nfs when building header
       archives
     - Fix read result collection in netfslib with multiple subrequests
     - Handle ENOMEM for netfslib buffered reads
     - Fix oops in nfs_netfs_init_request()
     - Parse the secctx command immediately in cachefiles
     - Remove a redundant smp_rmb() in netfslib
     - Handle recursion in read retry in netfslib
     - Fix clearing of folio_queue
     - Fix missing cancellation of copy-to_cache when the cache for a
       file is temporarly disabled in netfslib

 - Sanity check the hfs root record

 - Fix zero padding data issues in concurrent write scenarios

 - Fix is_mnt_ns_file() after converting nsfs to path_from_stashed()

 - Fix missing declaration of init_files

 - Increase I/O priority when writing revoke records in jbd2

 - Flush filesystem device before updating tail sequence in jbd2

* tag 'vfs-6.13-rc7.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs: (23 commits)
  ovl: support encoding fid from inode with no alias
  ovl: pass realinode to ovl_encode_real_fh() instead of realdentry
  fuse: respect FOPEN_KEEP_CACHE on opendir
  netfs: Fix is-caching check in read-retry
  netfs: Fix the (non-)cancellation of copy when cache is temporarily disabled
  netfs: Fix ceph copy to cache on write-begin
  netfs: Work around recursion by abandoning retry if nothing read
  netfs: Fix missing barriers by using clear_and_wake_up_bit()
  netfs: Remove redundant use of smp_rmb()
  cachefiles: Parse the "secctx" immediately
  nfs: Fix oops in nfs_netfs_init_request() when copying to cache
  netfs: Fix enomem handling in buffered reads
  netfs: Fix non-contiguous donation between completed reads
  kheaders: Ignore silly-rename files
  fs: relax assertions on failure to encode file handles
  fs: fix missing declaration of init_files
  fs: fix is_mnt_ns_file()
  iomap: fix zero padding data issue in concurrent append writes
  iomap: pass byte granular end position to iomap_add_to_ioend
  jbd2: flush filesystem device before updating tail sequence
  ...
parents 13563da6 368fcc5d

fs/9p/vfs_addr.c

+5 −1
Original line number Diff line number Diff line
@@ -57,6 +57,8 @@ static void v9fs_issue_write(struct netfs_io_subrequest *subreq) 
	int err, len;



	len = p9_client_write(fid, subreq->start, &subreq->io_iter, &err);

	if (len > 0)

		__set_bit(NETFS_SREQ_MADE_PROGRESS, &subreq->flags);

	netfs_write_subrequest_terminated(subreq, len ?: err, false);

}
@@ -80,8 +82,10 @@ static void v9fs_issue_read(struct netfs_io_subrequest *subreq) 
	if (pos + total >= i_size_read(rreq->inode))

		__set_bit(NETFS_SREQ_HIT_EOF, &subreq->flags);



	if (!err)

	if (!err) {

		subreq->transferred += total;

		__set_bit(NETFS_SREQ_MADE_PROGRESS, &subreq->flags);

	}



	netfs_read_subreq_terminated(subreq, err, false);

}

fs/afs/write.c

+4 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static void afs_issue_write_worker(struct work_struct *work) 
	if (subreq->debug_index == 3)

		return netfs_write_subrequest_terminated(subreq, -ENOANO, false);



	if (!test_bit(NETFS_SREQ_RETRYING, &subreq->flags)) {

	if (!subreq->retry_count) {

		set_bit(NETFS_SREQ_NEED_RETRY, &subreq->flags);

		return netfs_write_subrequest_terminated(subreq, -EAGAIN, false);

	}
@@ -149,6 +149,9 @@ static void afs_issue_write_worker(struct work_struct *work) 
	afs_wait_for_operation(op);

	ret = afs_put_operation(op);

	switch (ret) {

	case 0:

		__set_bit(NETFS_SREQ_MADE_PROGRESS, &subreq->flags);

		break;

	case -EACCES:

	case -EPERM:

	case -ENOKEY:

fs/cachefiles/daemon.c

+7 −7
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/namei.h>

#include <linux/poll.h>

#include <linux/mount.h>

#include <linux/security.h>

#include <linux/statfs.h>

#include <linux/ctype.h>

#include <linux/string.h>
@@ -576,7 +577,7 @@ static int cachefiles_daemon_dir(struct cachefiles_cache *cache, char *args) 
 */

static int cachefiles_daemon_secctx(struct cachefiles_cache *cache, char *args)

{

	char *secctx;

	int err;



	_enter(",%s", args);
@@ -585,16 +586,16 @@ static int cachefiles_daemon_secctx(struct cachefiles_cache *cache, char *args) 
		return -EINVAL;

	}



	if (cache->secctx) {

	if (cache->have_secid) {

		pr_err("Second security context specified\n");

		return -EINVAL;

	}



	secctx = kstrdup(args, GFP_KERNEL);

	if (!secctx)

		return -ENOMEM;

	err = security_secctx_to_secid(args, strlen(args), &cache->secid);

	if (err)

		return err;



	cache->secctx = secctx;

	cache->have_secid = true;

	return 0;

}
@@ -820,7 +821,6 @@ static void cachefiles_daemon_unbind(struct cachefiles_cache *cache) 
	put_cred(cache->cache_cred);



	kfree(cache->rootdirname);

	kfree(cache->secctx);

	kfree(cache->tag);



	_leave("");

fs/cachefiles/internal.h

+2 −1
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ struct cachefiles_cache { 
#define CACHEFILES_STATE_CHANGED	3	/* T if state changed (poll trigger) */

#define CACHEFILES_ONDEMAND_MODE	4	/* T if in on-demand read mode */

	char				*rootdirname;	/* name of cache root directory */

	char				*secctx;	/* LSM security context */

	char				*tag;		/* cache binding tag */

	refcount_t			unbind_pincount;/* refcount to do daemon unbind */

	struct xarray			reqs;		/* xarray of pending on-demand requests */
@@ -130,6 +129,8 @@ struct cachefiles_cache { 
	struct xarray			ondemand_ids;	/* xarray for ondemand_id allocation */

	u32				ondemand_id_next;

	u32				msg_id_next;

	u32				secid;		/* LSM security id */

	bool				have_secid;	/* whether "secid" was set */

};



static inline bool cachefiles_in_ondemand_mode(struct cachefiles_cache *cache)

fs/cachefiles/security.c

+3 −3
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ int cachefiles_get_security_ID(struct cachefiles_cache *cache) 
	struct cred *new;

	int ret;



	_enter("{%s}", cache->secctx);

	_enter("{%u}", cache->have_secid ? cache->secid : 0);



	new = prepare_kernel_cred(current);

	if (!new) {
@@ -26,8 +26,8 @@ int cachefiles_get_security_ID(struct cachefiles_cache *cache) 
		goto error;

	}



	if (cache->secctx) {

		ret = set_security_override_from_ctx(new, cache->secctx);

	if (cache->have_secid) {

		ret = set_security_override(new, cache->secid);

		if (ret < 0) {

			put_cred(new);

			pr_err("Security denies permission to nominate security context: error %d\n",