Commit 9d9c1cfe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-nonmm-stable-2025-12-11-11-47' of... 

Merge tag 'mm-nonmm-stable-2025-12-11-11-47' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull misc updates from Andrew Morton:
 "There are no significant series in this small merge. Please see the
  individual changelogs for details"

[ Editor's note: it's mainly ocfs2 and a couple of random fixes ]

* tag 'mm-nonmm-stable-2025-12-11-11-47' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
  mm: memfd_luo: add CONFIG_SHMEM dependency
  mm: shmem: avoid build warning for CONFIG_SHMEM=n
  ocfs2: fix memory leak in ocfs2_merge_rec_left()
  ocfs2: invalidate inode if i_mode is zero after block read
  ocfs2: avoid -Wflex-array-member-not-at-end warning
  ocfs2: convert remaining read-only checks to ocfs2_emergency_state
  ocfs2: add ocfs2_emergency_state helper and apply to setattr
  checkpatch: add uninitialized pointer with __free attribute check
  args: fix documentation to reflect the correct numbers
  ocfs2: fix kernel BUG in ocfs2_find_victim_chain
  liveupdate: luo_core: fix redundant bound check in luo_ioctl()
  ocfs2: validate inline xattr size and entry count in ocfs2_xattr_ibody_list
  fs/fat: remove unnecessary wrapper fat_max_cache()
  ocfs2: replace deprecated strcpy with strscpy
  ocfs2: check tl_used after reading it from trancate log inode
  liveupdate: luo_file: don't use invalid list iterator
parents 2516a871 601cc399

Documentation/dev-tools/checkpatch.rst

+23 −0
Original line number Diff line number Diff line
@@ -1002,6 +1002,29 @@ Functions and Variables 


      return bar;



  **UNINITIALIZED_PTR_WITH_FREE**

    Pointers with __free attribute should be declared at the place of use

    and initialized (see include/linux/cleanup.h). In this case

    declarations at the top of the function rule can be relaxed. Not doing

    so may lead to undefined behavior as the memory assigned (garbage,

    in case not initialized) to the pointer is freed automatically when

    the pointer goes out of scope.



    Also see: https://lore.kernel.org/lkml/58fd478f408a34b578ee8d949c5c4b4da4d4f41d.camel@HansenPartnership.com/



    Example::



      type var __free(free_func);

      ... // var not used, but, in future someone might add a return here

      var = malloc(var_size);

      ...



    should be initialized as::



      ...

      type var __free(free_func) = malloc(var_size);

      ...





Permissions

-----------

fs/fat/cache.c

+1 −6
Original line number Diff line number Diff line
@@ -29,11 +29,6 @@ struct fat_cache_id { 
	int dcluster;

};



static inline int fat_max_cache(struct inode *inode)

{

	return FAT_MAX_CACHE;

}



static struct kmem_cache *fat_cache_cachep;



static void init_once(void *foo)
@@ -145,7 +140,7 @@ static void fat_cache_add(struct inode *inode, struct fat_cache_id *new) 


	cache = fat_cache_merge(inode, new);

	if (cache == NULL) {

		if (MSDOS_I(inode)->nr_caches < fat_max_cache(inode)) {

		if (MSDOS_I(inode)->nr_caches < FAT_MAX_CACHE) {

			MSDOS_I(inode)->nr_caches++;

			spin_unlock(&MSDOS_I(inode)->cache_lru_lock);

fs/ocfs2/alloc.c

+7 −5
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/fs.h>

#include <linux/types.h>

#include <linux/slab.h>

#include <linux/string.h>

#include <linux/highmem.h>

#include <linux/swap.h>

#include <linux/quotaops.h>
@@ -1037,7 +1038,7 @@ static int ocfs2_create_new_meta_bhs(handle_t *handle, 
			memset(bhs[i]->b_data, 0, osb->sb->s_blocksize);

			eb = (struct ocfs2_extent_block *) bhs[i]->b_data;

			/* Ok, setup the minimal stuff here. */

			strcpy(eb->h_signature, OCFS2_EXTENT_BLOCK_SIGNATURE);

			strscpy(eb->h_signature, OCFS2_EXTENT_BLOCK_SIGNATURE);

			eb->h_blkno = cpu_to_le64(first_blkno);

			eb->h_fs_generation = cpu_to_le32(osb->fs_generation);

			eb->h_suballoc_slot =
@@ -3654,7 +3655,6 @@ static int ocfs2_merge_rec_left(struct ocfs2_path *right_path, 
			 * So we use the new rightmost path.

			 */

			ocfs2_mv_path(right_path, left_path);

			left_path = NULL;

		} else

			ocfs2_complete_edge_insert(handle, left_path,

						   right_path, subtree_index);
@@ -6164,7 +6164,7 @@ static int ocfs2_get_truncate_log_info(struct ocfs2_super *osb, 
	struct buffer_head *bh = NULL;

	struct ocfs2_dinode *di;

	struct ocfs2_truncate_log *tl;

	unsigned int tl_count;

	unsigned int tl_count, tl_used;



	inode = ocfs2_get_system_file_inode(osb,

					   TRUNCATE_LOG_SYSTEM_INODE,
@@ -6185,8 +6185,10 @@ static int ocfs2_get_truncate_log_info(struct ocfs2_super *osb, 
	di = (struct ocfs2_dinode *)bh->b_data;

	tl = &di->id2.i_dealloc;

	tl_count = le16_to_cpu(tl->tl_count);

	tl_used = le16_to_cpu(tl->tl_used);

	if (unlikely(tl_count > ocfs2_truncate_recs_per_inode(osb->sb) ||

		     tl_count == 0)) {

		     tl_count == 0 ||

		     tl_used > tl_count)) {

		status = -EFSCORRUPTED;

		iput(inode);

		brelse(bh);
@@ -6744,7 +6746,7 @@ static int ocfs2_reuse_blk_from_dealloc(handle_t *handle, 
		/* We can't guarantee that buffer head is still cached, so

		 * polutlate the extent block again.

		 */

		strcpy(eb->h_signature, OCFS2_EXTENT_BLOCK_SIGNATURE);

		strscpy(eb->h_signature, OCFS2_EXTENT_BLOCK_SIGNATURE);

		eb->h_blkno = cpu_to_le64(bf->free_blk);

		eb->h_fs_generation = cpu_to_le32(osb->fs_generation);

		eb->h_suballoc_slot = cpu_to_le16(real_slot);

fs/ocfs2/buffer_head_io.c

+1 −1
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ int ocfs2_write_super_or_backup(struct ocfs2_super *osb, 
	BUG_ON(buffer_jbd(bh));

	ocfs2_check_super_or_backup(osb->sb, bh->b_blocknr);



	if (ocfs2_is_hard_readonly(osb) || ocfs2_is_soft_readonly(osb)) {

	if (unlikely(ocfs2_emergency_state(osb))) {

		ret = -EROFS;

		mlog_errno(ret);

		goto out;

fs/ocfs2/cluster/nodemanager.c

+2 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 */



#include <linux/slab.h>

#include <linux/string.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/configfs.h>
@@ -590,7 +591,7 @@ static struct config_item *o2nm_node_group_make_item(struct config_group *group, 
	if (node == NULL)

		return ERR_PTR(-ENOMEM);



	strcpy(node->nd_name, name); /* use item.ci_namebuf instead? */

	strscpy(node->nd_name, name); /* use item.ci_namebuf instead? */

	config_item_init_type_name(&node->nd_item, name, &o2nm_node_type);

	spin_lock_init(&node->nd_lock);