diff options
| author | Tom Rini <[email protected]> | 2025-03-10 18:12:27 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-03-10 20:18:51 -0600 |
| commit | 1b42f57ec82ceba4d5f08cfb359717232301cfa5 (patch) | |
| tree | 31d06c51e893855c3f52c0aa9bc9330b17376374 /fs | |
| parent | 124b75644cf4a9b381746f6deed1472e7915b9f1 (diff) | |
| parent | a383b9bd4d7e430fe7c254297540bae596649dba (diff) | |
Merge tag 'v2025.04-rc4' into next
This uses Heinrich's merge of lib/efi_loader/efi_net.c which results in
no changes.
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/squashfs/sqfs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/squashfs/sqfs.c b/fs/squashfs/sqfs.c index 8fac6c6c5a9..7c364686f14 100644 --- a/fs/squashfs/sqfs.c +++ b/fs/squashfs/sqfs.c @@ -1712,7 +1712,8 @@ static int sqfs_size_nest(const char *filename, loff_t *size) case SQFS_LSYMLINK_TYPE: if (++symlinknest == MAX_SYMLINK_NEST) { *size = 0; - return -ELOOP; + ret = -ELOOP; + break; } symlink = (struct squashfs_symlink_inode *)ipos; |