Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'for-6.18-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
Pull btrfs fixes from David Sterba:
"Two short fixes that would be good to have before rc1"
* tag 'for-6.18-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
btrfs: fix PAGE_SIZE format specifier in open_ctree()
btrfs: avoid potential out-of-bounds in btrfs_encode_fh()
+8
-2
+1
-1
fs/btrfs/disk-io.c
+1
-1
fs/btrfs/disk-io.c
···
3397
3397
3398
3398
if (fs_info->sectorsize > PAGE_SIZE)
3399
3399
btrfs_warn(fs_info,
3400
-
"support for block size %u with page size %zu is experimental, some features may be missing",
3400
+
"support for block size %u with page size %lu is experimental, some features may be missing",
3401
3401
fs_info->sectorsize, PAGE_SIZE);
3402
3402
/*
3403
3403
* Handle the space caching options appropriately now that we have the
+7
-1
fs/btrfs/export.c
+7
-1
fs/btrfs/export.c
···
23
23
int type;
24
24
25
25
if (parent && (len < BTRFS_FID_SIZE_CONNECTABLE)) {
26
-
*max_len = BTRFS_FID_SIZE_CONNECTABLE;
26
+
if (btrfs_root_id(BTRFS_I(inode)->root) !=
27
+
btrfs_root_id(BTRFS_I(parent)->root))
28
+
*max_len = BTRFS_FID_SIZE_CONNECTABLE_ROOT;
29
+
else
30
+
*max_len = BTRFS_FID_SIZE_CONNECTABLE;
27
31
return FILEID_INVALID;
28
32
} else if (len < BTRFS_FID_SIZE_NON_CONNECTABLE) {
29
33
*max_len = BTRFS_FID_SIZE_NON_CONNECTABLE;
···
49
45
parent_root_id = btrfs_root_id(BTRFS_I(parent)->root);
50
46
51
47
if (parent_root_id != fid->root_objectid) {
48
+
if (*max_len < BTRFS_FID_SIZE_CONNECTABLE_ROOT)
49
+
return FILEID_INVALID;
52
50
fid->parent_root_objectid = parent_root_id;
53
51
len = BTRFS_FID_SIZE_CONNECTABLE_ROOT;
54
52
type = FILEID_BTRFS_WITH_PARENT_ROOT;