Skip to content

Commit 5fa1d6a

Browse files
bryamzxzjankara
authored andcommitted
isofs: bound Rock Ridge symlink components to the SL record
get_symlink_chunk() and the SL handling in parse_rock_ridge_inode_internal() walk the variable-length components of a Rock Ridge "SL" (symbolic link) record. Each component is a two-byte header (flags, len) followed by len bytes of text, so it occupies slp->len + 2 bytes. Both loops read slp->len and advance to the next component, and get_symlink_chunk() additionally does memcpy(rpnt, slp->text, slp->len), but neither checks that the component lies within the SL record before dereferencing it. A crafted SL record whose component declares a len that runs past the record (rr->len) therefore triggers an out-of-bounds read of up to 255 bytes. When the record sits at the tail of its backing buffer - for example a small kmalloc()ed continuation block reached through a CE record - the read crosses the allocation; get_symlink_chunk() then copies the out-of-bounds bytes into the symlink body returned to user space by readlink(), disclosing adjacent kernel memory. ISO 9660 images are routinely mounted from untrusted removable media - desktop environments auto-mount them (e.g. via udisks2) without CAP_SYS_ADMIN - so the record contents are attacker-controlled. Reject any component that does not fit in the remaining record bytes before using it. In get_symlink_chunk() return NULL, like the existing output-buffer (plimit) checks, so a malformed record makes readlink() fail with -EIO rather than silently returning a truncated target; in parse_rock_ridge_inode_internal() stop the inode-size walk. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Cc: stable@vger.kernel.org Suggested-by: Michael Bommarito <michael.bommarito@gmail.com> Signed-off-by: Bryam Vargas <hexlabsecurity@proton.me> Link: https://patch.msgid.link/20260607011823.217748-1-hexlabsecurity@proton.me Signed-off-by: Jan Kara <jack@suse.cz>
1 parent a4659be commit 5fa1d6a

1 file changed

Lines changed: 11 additions & 0 deletions

File tree

fs/isofs/rock.c

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,9 @@ parse_rock_ridge_inode_internal(struct iso_directory_record *de,
466466
inode->i_size = symlink_len;
467467
while (slen > 1) {
468468
rootflag = 0;
469+
/* keep the component within the SL record */
470+
if (slp->len + 2 > slen)
471+
goto eio;
469472
switch (slp->flags & ~1) {
470473
case 0:
471474
inode->i_size +=
@@ -621,6 +624,14 @@ static char *get_symlink_chunk(char *rpnt, struct rock_ridge *rr, char *plimit)
621624
slp = &rr->u.SL.link;
622625
while (slen > 1) {
623626
rootflag = 0;
627+
/*
628+
* A component is slp->len + 2 bytes (a two-byte header plus
629+
* len bytes of text). If it does not fit in the bytes left in
630+
* the SL record the record is malformed: fail like the plimit
631+
* checks below so readlink() returns -EIO, not a truncated path.
632+
*/
633+
if (slp->len + 2 > slen)
634+
return NULL;
624635
switch (slp->flags & ~1) {
625636
case 0:
626637
if (slp->len > plimit - rpnt)

0 commit comments

Comments
 (0)