| Message ID | 20170308210112.GR5280@birch.djwong.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On Wed, Mar 08, 2017 at 01:01:12PM -0800, Darrick J. Wong wrote: > Check that we don't run off the end of the inline data buffer when we're > trying to read directory entries. xfs/348 triggered kernel memory being > exposed to userspace and a related complaint from the usercopy code. > > Evidently once we call dir_emit, the VFS ignores error return values > since it's already begun copying data back to userspace. > How do we get into this situation in the first place? > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> > --- > fs/xfs/xfs_dir2_readdir.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c > index 003a99b..70bdd21 100644 > --- a/fs/xfs/xfs_dir2_readdir.c > +++ b/fs/xfs/xfs_dir2_readdir.c > @@ -69,6 +69,7 @@ xfs_dir2_sf_getdents( > xfs_dir2_dataptr_t dotdot_offset; > xfs_ino_t ino; > struct xfs_da_geometry *geo = args->geo; > + char *endp; > > ASSERT(dp->i_df.if_flags & XFS_IFINLINE); > /* > @@ -83,6 +84,7 @@ xfs_dir2_sf_getdents( > ASSERT(dp->i_df.if_u1.if_data != NULL); > > sfp = (xfs_dir2_sf_hdr_t *)dp->i_df.if_u1.if_data; > + endp = dp->i_df.if_u1.if_data + dp->i_df.if_bytes; > > if (dp->i_d.di_size < xfs_dir2_sf_hdr_size(sfp->i8count)) > return -EFSCORRUPTED; > @@ -130,6 +132,12 @@ xfs_dir2_sf_getdents( > for (i = 0; i < sfp->count; i++) { > __uint8_t filetype; > > + /* If we pass the end of the buffer, we're done. */ > + if (((char *)sfep + sizeof(*sfep)) >= endp || > + (char *)dp->d_ops->sf_nextentry(sfp, sfep) > endp) { > + break; > + } > + What's the reason for checking ->sf_nextentry()? Brian > off = xfs_dir2_db_off_to_dataptr(geo, geo->datablk, > xfs_dir2_sf_get_offset(sfep)); > > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Mar 13, 2017 at 08:39:40AM -0400, Brian Foster wrote: > On Wed, Mar 08, 2017 at 01:01:12PM -0800, Darrick J. Wong wrote: > > Check that we don't run off the end of the inline data buffer when we're > > trying to read directory entries. xfs/348 triggered kernel memory being > > exposed to userspace and a related complaint from the usercopy code. > > > > Evidently once we call dir_emit, the VFS ignores error return values > > since it's already begun copying data back to userspace. > > > > How do we get into this situation in the first place? xfs/348 changes the filetype of an (inline) symlink) to an (inline) dir; the contents of the symlink look just enough like a dir that we don't hit any of the checks that bounce us out of xfs_dir2_sf_getdents, and the loop doesn't prevent *sfp from running off the end of the data fork buffer... ...at which point the code that protects the kernel from copying uninitialized kernel memory into userspace kicks in, terminating the process with the iolock held, which causes us to blow an ASSERT when the inode gets reaped with the iolock still held. > > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> > > --- > > fs/xfs/xfs_dir2_readdir.c | 8 ++++++++ > > 1 file changed, 8 insertions(+) > > > > diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c > > index 003a99b..70bdd21 100644 > > --- a/fs/xfs/xfs_dir2_readdir.c > > +++ b/fs/xfs/xfs_dir2_readdir.c > > @@ -69,6 +69,7 @@ xfs_dir2_sf_getdents( > > xfs_dir2_dataptr_t dotdot_offset; > > xfs_ino_t ino; > > struct xfs_da_geometry *geo = args->geo; > > + char *endp; > > > > ASSERT(dp->i_df.if_flags & XFS_IFINLINE); > > /* > > @@ -83,6 +84,7 @@ xfs_dir2_sf_getdents( > > ASSERT(dp->i_df.if_u1.if_data != NULL); > > > > sfp = (xfs_dir2_sf_hdr_t *)dp->i_df.if_u1.if_data; > > + endp = dp->i_df.if_u1.if_data + dp->i_df.if_bytes; > > > > if (dp->i_d.di_size < xfs_dir2_sf_hdr_size(sfp->i8count)) > > return -EFSCORRUPTED; > > @@ -130,6 +132,12 @@ xfs_dir2_sf_getdents( > > for (i = 0; i < sfp->count; i++) { > > __uint8_t filetype; > > > > + /* If we pass the end of the buffer, we're done. */ > > + if (((char *)sfep + sizeof(*sfep)) >= endp || > > + (char *)dp->d_ops->sf_nextentry(sfp, sfep) > endp) { > > + break; > > + } > > + > > What's the reason for checking ->sf_nextentry()? struct xfs_dir2_sf_entry (*sfep's type) has a zero-length array for the entry name at the end of the structure definition. In other words, the structure effectively has a variable length. Therefore we must first check that the non-variable parts of the structure don't go off the end of the array, and then we must check that the name also does not go off the end of the array, which we do by computing the nextentry pointer. (Should I add that as a comment?) --D > > Brian > > > off = xfs_dir2_db_off_to_dataptr(geo, geo->datablk, > > xfs_dir2_sf_get_offset(sfep)); > > > > -- > > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > > the body of a message to majordomo@vger.kernel.org > > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Mar 13, 2017 at 01:55:34PM -0700, Darrick J. Wong wrote: > On Mon, Mar 13, 2017 at 08:39:40AM -0400, Brian Foster wrote: > > On Wed, Mar 08, 2017 at 01:01:12PM -0800, Darrick J. Wong wrote: > > > Check that we don't run off the end of the inline data buffer when we're > > > trying to read directory entries. xfs/348 triggered kernel memory being > > > exposed to userspace and a related complaint from the usercopy code. > > > > > > Evidently once we call dir_emit, the VFS ignores error return values > > > since it's already begun copying data back to userspace. > > > > > > > How do we get into this situation in the first place? > > xfs/348 changes the filetype of an (inline) symlink) to an (inline) dir; > the contents of the symlink look just enough like a dir that we don't > hit any of the checks that bounce us out of xfs_dir2_sf_getdents, and > the loop doesn't prevent *sfp from running off the end of the data fork > buffer... > > ...at which point the code that protects the kernel from copying > uninitialized kernel memory into userspace kicks in, terminating the > process with the iolock held, which causes us to blow an ASSERT when the > inode gets reaped with the iolock still held. > Got it, thanks. > > > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> > > > --- > > > fs/xfs/xfs_dir2_readdir.c | 8 ++++++++ > > > 1 file changed, 8 insertions(+) > > > > > > diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c > > > index 003a99b..70bdd21 100644 > > > --- a/fs/xfs/xfs_dir2_readdir.c > > > +++ b/fs/xfs/xfs_dir2_readdir.c > > > @@ -69,6 +69,7 @@ xfs_dir2_sf_getdents( > > > xfs_dir2_dataptr_t dotdot_offset; > > > xfs_ino_t ino; > > > struct xfs_da_geometry *geo = args->geo; > > > + char *endp; > > > > > > ASSERT(dp->i_df.if_flags & XFS_IFINLINE); > > > /* > > > @@ -83,6 +84,7 @@ xfs_dir2_sf_getdents( > > > ASSERT(dp->i_df.if_u1.if_data != NULL); > > > > > > sfp = (xfs_dir2_sf_hdr_t *)dp->i_df.if_u1.if_data; > > > + endp = dp->i_df.if_u1.if_data + dp->i_df.if_bytes; > > > > > > if (dp->i_d.di_size < xfs_dir2_sf_hdr_size(sfp->i8count)) > > > return -EFSCORRUPTED; > > > @@ -130,6 +132,12 @@ xfs_dir2_sf_getdents( > > > for (i = 0; i < sfp->count; i++) { > > > __uint8_t filetype; > > > > > > + /* If we pass the end of the buffer, we're done. */ > > > + if (((char *)sfep + sizeof(*sfep)) >= endp || > > > + (char *)dp->d_ops->sf_nextentry(sfp, sfep) > endp) { > > > + break; > > > + } > > > + > > > > What's the reason for checking ->sf_nextentry()? > > struct xfs_dir2_sf_entry (*sfep's type) has a zero-length array for the > entry name at the end of the structure definition. In other words, the > structure effectively has a variable length. Therefore we must first > check that the non-variable parts of the structure don't go off the end > of the array, and then we must check that the name also does not go off > the end of the array, which we do by computing the nextentry pointer. > > (Should I add that as a comment?) > Ok. Yeah, that would be useful. A bit more clear IMO would be to use ->sf_entsize(), if possible, to just verify through the end of the current entry based on the namelen. I'm also wondering if it's useful to return an error even if the caller might not use it. What about if ctx->pos starts at the entry that crosses the data fork boundary, for example? Brian > --D > > > > > Brian > > > > > off = xfs_dir2_db_off_to_dataptr(geo, geo->datablk, > > > xfs_dir2_sf_get_offset(sfep)); > > > > > > -- > > > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > > > the body of a message to majordomo@vger.kernel.org > > > More majordomo info at http://vger.kernel.org/majordomo-info.html > > -- > > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > > the body of a message to majordomo@vger.kernel.org > > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Mar 14, 2017 at 07:33:18AM -0400, Brian Foster wrote: > On Mon, Mar 13, 2017 at 01:55:34PM -0700, Darrick J. Wong wrote: > > On Mon, Mar 13, 2017 at 08:39:40AM -0400, Brian Foster wrote: > > > On Wed, Mar 08, 2017 at 01:01:12PM -0800, Darrick J. Wong wrote: > > > > Check that we don't run off the end of the inline data buffer when we're > > > > trying to read directory entries. xfs/348 triggered kernel memory being > > > > exposed to userspace and a related complaint from the usercopy code. > > > > > > > > Evidently once we call dir_emit, the VFS ignores error return values > > > > since it's already begun copying data back to userspace. > > > > > > > > > > How do we get into this situation in the first place? > > > > xfs/348 changes the filetype of an (inline) symlink) to an (inline) dir; > > the contents of the symlink look just enough like a dir that we don't > > hit any of the checks that bounce us out of xfs_dir2_sf_getdents, and > > the loop doesn't prevent *sfp from running off the end of the data fork > > buffer... > > > > ...at which point the code that protects the kernel from copying > > uninitialized kernel memory into userspace kicks in, terminating the > > process with the iolock held, which causes us to blow an ASSERT when the > > inode gets reaped with the iolock still held. > > > > Got it, thanks. > > > > > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> > > > > --- > > > > fs/xfs/xfs_dir2_readdir.c | 8 ++++++++ > > > > 1 file changed, 8 insertions(+) > > > > > > > > diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c > > > > index 003a99b..70bdd21 100644 > > > > --- a/fs/xfs/xfs_dir2_readdir.c > > > > +++ b/fs/xfs/xfs_dir2_readdir.c > > > > @@ -69,6 +69,7 @@ xfs_dir2_sf_getdents( > > > > xfs_dir2_dataptr_t dotdot_offset; > > > > xfs_ino_t ino; > > > > struct xfs_da_geometry *geo = args->geo; > > > > + char *endp; > > > > > > > > ASSERT(dp->i_df.if_flags & XFS_IFINLINE); > > > > /* > > > > @@ -83,6 +84,7 @@ xfs_dir2_sf_getdents( > > > > ASSERT(dp->i_df.if_u1.if_data != NULL); > > > > > > > > sfp = (xfs_dir2_sf_hdr_t *)dp->i_df.if_u1.if_data; > > > > + endp = dp->i_df.if_u1.if_data + dp->i_df.if_bytes; > > > > > > > > if (dp->i_d.di_size < xfs_dir2_sf_hdr_size(sfp->i8count)) > > > > return -EFSCORRUPTED; > > > > @@ -130,6 +132,12 @@ xfs_dir2_sf_getdents( > > > > for (i = 0; i < sfp->count; i++) { > > > > __uint8_t filetype; > > > > > > > > + /* If we pass the end of the buffer, we're done. */ > > > > + if (((char *)sfep + sizeof(*sfep)) >= endp || > > > > + (char *)dp->d_ops->sf_nextentry(sfp, sfep) > endp) { > > > > + break; > > > > + } > > > > + > > > > > > What's the reason for checking ->sf_nextentry()? > > > > struct xfs_dir2_sf_entry (*sfep's type) has a zero-length array for the > > entry name at the end of the structure definition. In other words, the > > structure effectively has a variable length. Therefore we must first > > check that the non-variable parts of the structure don't go off the end > > of the array, and then we must check that the name also does not go off > > the end of the array, which we do by computing the nextentry pointer. > > > > (Should I add that as a comment?) > > > > Ok. Yeah, that would be useful. A bit more clear IMO would be to use > ->sf_entsize(), if possible, to just verify through the end of the > current entry based on the namelen. <shrug> sf_nextentry() is basically (sfep + sf_entsize()), so I don't think it makes much difference. > I'm also wondering if it's useful to return an error even if the caller > might not use it. What about if ctx->pos starts at the entry that > crosses the data fork boundary, for example? The caller won't see it at all -- I tried returning -EFSCORRUPTED but the VFS ignores that once we start calling dir_emit, apparently because we've already started writing to the userspace buffer, and partial result trumps error codes. Maybe we should fix the VFS too, but it will take time (or a hallway BoF next week) for me to understand the VFS code well enough to produce a patch. In the meantime this allows me to get through a entire auto group xfstests run without crashing, because I did not succeed in moving xfs/348 out of the auto group. The reason for breaking out of the loop and setting ctx->pos the way we do is (I think) because if userspace sees that pos < len then it will keep calling getdents trying to read to the end of the buffer. Since the VFS eats the EFSCORRUPTED if we've already emitted the dot/dotdot entries, we can't return an error code to userspace, so the only option left is to allow ctx->pos to get set to a value high enough that userspace won't come back. --D > > Brian > > > --D > > > > > > > > Brian > > > > > > > off = xfs_dir2_db_off_to_dataptr(geo, geo->datablk, > > > > xfs_dir2_sf_get_offset(sfep)); > > > > > > > > -- > > > > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > > > > the body of a message to majordomo@vger.kernel.org > > > > More majordomo info at http://vger.kernel.org/majordomo-info.html > > > -- > > > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > > > the body of a message to majordomo@vger.kernel.org > > > More majordomo info at http://vger.kernel.org/majordomo-info.html > > -- > > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > > the body of a message to majordomo@vger.kernel.org > > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Mar 14, 2017 at 11:37:47AM -0700, Darrick J. Wong wrote: > On Tue, Mar 14, 2017 at 07:33:18AM -0400, Brian Foster wrote: > > On Mon, Mar 13, 2017 at 01:55:34PM -0700, Darrick J. Wong wrote: > > > On Mon, Mar 13, 2017 at 08:39:40AM -0400, Brian Foster wrote: > > > > On Wed, Mar 08, 2017 at 01:01:12PM -0800, Darrick J. Wong wrote: > > > > > Check that we don't run off the end of the inline data buffer when we're > > > > > trying to read directory entries. xfs/348 triggered kernel memory being > > > > > exposed to userspace and a related complaint from the usercopy code. > > > > > > > > > > Evidently once we call dir_emit, the VFS ignores error return values > > > > > since it's already begun copying data back to userspace. > > > > > > > > > > > > > How do we get into this situation in the first place? > > > > > > xfs/348 changes the filetype of an (inline) symlink) to an (inline) dir; > > > the contents of the symlink look just enough like a dir that we don't > > > hit any of the checks that bounce us out of xfs_dir2_sf_getdents, and > > > the loop doesn't prevent *sfp from running off the end of the data fork > > > buffer... > > > > > > ...at which point the code that protects the kernel from copying > > > uninitialized kernel memory into userspace kicks in, terminating the > > > process with the iolock held, which causes us to blow an ASSERT when the > > > inode gets reaped with the iolock still held. > > > > > > > Got it, thanks. > > > > > > > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> > > > > > --- > > > > > fs/xfs/xfs_dir2_readdir.c | 8 ++++++++ > > > > > 1 file changed, 8 insertions(+) > > > > > > > > > > diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c > > > > > index 003a99b..70bdd21 100644 > > > > > --- a/fs/xfs/xfs_dir2_readdir.c > > > > > +++ b/fs/xfs/xfs_dir2_readdir.c > > > > > @@ -69,6 +69,7 @@ xfs_dir2_sf_getdents( > > > > > xfs_dir2_dataptr_t dotdot_offset; > > > > > xfs_ino_t ino; > > > > > struct xfs_da_geometry *geo = args->geo; > > > > > + char *endp; > > > > > > > > > > ASSERT(dp->i_df.if_flags & XFS_IFINLINE); > > > > > /* > > > > > @@ -83,6 +84,7 @@ xfs_dir2_sf_getdents( > > > > > ASSERT(dp->i_df.if_u1.if_data != NULL); > > > > > > > > > > sfp = (xfs_dir2_sf_hdr_t *)dp->i_df.if_u1.if_data; > > > > > + endp = dp->i_df.if_u1.if_data + dp->i_df.if_bytes; > > > > > > > > > > if (dp->i_d.di_size < xfs_dir2_sf_hdr_size(sfp->i8count)) > > > > > return -EFSCORRUPTED; > > > > > @@ -130,6 +132,12 @@ xfs_dir2_sf_getdents( > > > > > for (i = 0; i < sfp->count; i++) { > > > > > __uint8_t filetype; > > > > > > > > > > + /* If we pass the end of the buffer, we're done. */ > > > > > + if (((char *)sfep + sizeof(*sfep)) >= endp || > > > > > + (char *)dp->d_ops->sf_nextentry(sfp, sfep) > endp) { > > > > > + break; > > > > > + } > > > > > + > > > > > > > > What's the reason for checking ->sf_nextentry()? > > > > > > struct xfs_dir2_sf_entry (*sfep's type) has a zero-length array for the > > > entry name at the end of the structure definition. In other words, the > > > structure effectively has a variable length. Therefore we must first > > > check that the non-variable parts of the structure don't go off the end > > > of the array, and then we must check that the name also does not go off > > > the end of the array, which we do by computing the nextentry pointer. > > > > > > (Should I add that as a comment?) > > > > > > > Ok. Yeah, that would be useful. A bit more clear IMO would be to use > > ->sf_entsize(), if possible, to just verify through the end of the > > current entry based on the namelen. > > <shrug> sf_nextentry() is basically (sfep + sf_entsize()), so I don't think > it makes much difference. > Yeah. I suggested it because I find it more clear. > > I'm also wondering if it's useful to return an error even if the caller > > might not use it. What about if ctx->pos starts at the entry that > > crosses the data fork boundary, for example? > > The caller won't see it at all -- I tried returning -EFSCORRUPTED but > the VFS ignores that once we start calling dir_emit, apparently because > we've already started writing to the userspace buffer, and partial > result trumps error codes. Maybe we should fix the VFS too, but it will > take time (or a hallway BoF next week) for me to understand the VFS code > well enough to produce a patch. In the meantime this allows me to get > through a entire auto group xfstests run without crashing, because I > did not succeed in moving xfs/348 out of the auto group. > I'm talking about covering the case where we haven't yet emitted any data. AFAICT, readdir()/getdents() don't override error in that case. Granted, if we're walking through a completely bogus buffer (with respect to the assumption of a directory), then I guess there's no guarantee the ctx->pos updates are going to honor the associated expectations either. > The reason for breaking out of the loop and setting ctx->pos the way we > do is (I think) because if userspace sees that pos < len then it will > keep calling getdents trying to read to the end of the buffer. Since > the VFS eats the EFSCORRUPTED if we've already emitted the dot/dotdot > entries, we can't return an error code to userspace, so the only option > left is to allow ctx->pos to get set to a value high enough that > userspace won't come back. > I'm not sure a userspace app will care as much about the pos vs. the buffer len as opposed to the eof semantics of getdents(), though I haven't dug into it so I could certainly be mistaken. The more I think about this, however, the more it seems like this kind of behavior is still possible with a particularly crafted corruption. getdents() looks like it just overwrites the d_off of the last emitted dirent with the last visited dirent. Even with this change, I don't see what prevents the last visited dirent offset from being something that starts the sequence over from the beginning on the next call (considering a zero return designates eof). IOW, it seems like we're playing whack-a-mole here. The fundamental problem seems to be that we have no type-specific verification of local format inodes like we do for buffers. E.g., I presume a non-local format inode wouldn't get past the directory verifier in this situation. I'm wondering if the proper solution here is to start factoring in local format verifiers for the associated data forks. A short term hack may be to embed such a verifier call right in dir2_sf_getdents() (downside being we'd call it on every readdir(), but I doubt that has much of an impact). Longer term, wire those calls up somehow or another during data fork initialization of local format inodes and invoke the write side at xfs_iflush_fork() time. Thoughts? Brian > --D > > > > > Brian > > > > > --D > > > > > > > > > > > Brian > > > > > > > > > off = xfs_dir2_db_off_to_dataptr(geo, geo->datablk, > > > > > xfs_dir2_sf_get_offset(sfep)); > > > > > > > > > > -- > > > > > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > > > > > the body of a message to majordomo@vger.kernel.org > > > > > More majordomo info at http://vger.kernel.org/majordomo-info.html > > > > -- > > > > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > > > > the body of a message to majordomo@vger.kernel.org > > > > More majordomo info at http://vger.kernel.org/majordomo-info.html > > > -- > > > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > > > the body of a message to majordomo@vger.kernel.org > > > More majordomo info at http://vger.kernel.org/majordomo-info.html > > -- > > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > > the body of a message to majordomo@vger.kernel.org > > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Mar 14, 2017 at 04:24:53PM -0400, Brian Foster wrote: > On Tue, Mar 14, 2017 at 11:37:47AM -0700, Darrick J. Wong wrote: > > On Tue, Mar 14, 2017 at 07:33:18AM -0400, Brian Foster wrote: > > > On Mon, Mar 13, 2017 at 01:55:34PM -0700, Darrick J. Wong wrote: > > > > On Mon, Mar 13, 2017 at 08:39:40AM -0400, Brian Foster wrote: > > > > > On Wed, Mar 08, 2017 at 01:01:12PM -0800, Darrick J. Wong wrote: > > > > > > Check that we don't run off the end of the inline data buffer when we're > > > > > > trying to read directory entries. xfs/348 triggered kernel memory being > > > > > > exposed to userspace and a related complaint from the usercopy code. > > > > > > > > > > > > Evidently once we call dir_emit, the VFS ignores error return values > > > > > > since it's already begun copying data back to userspace. > > > > > > > > > > > > > > > > How do we get into this situation in the first place? > > > > > > > > xfs/348 changes the filetype of an (inline) symlink) to an (inline) dir; > > > > the contents of the symlink look just enough like a dir that we don't > > > > hit any of the checks that bounce us out of xfs_dir2_sf_getdents, and > > > > the loop doesn't prevent *sfp from running off the end of the data fork > > > > buffer... > > > > > > > > ...at which point the code that protects the kernel from copying > > > > uninitialized kernel memory into userspace kicks in, terminating the > > > > process with the iolock held, which causes us to blow an ASSERT when the > > > > inode gets reaped with the iolock still held. > > > > > > > > > > Got it, thanks. > > > > > > > > > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> > > > > > > --- > > > > > > fs/xfs/xfs_dir2_readdir.c | 8 ++++++++ > > > > > > 1 file changed, 8 insertions(+) > > > > > > > > > > > > diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c > > > > > > index 003a99b..70bdd21 100644 > > > > > > --- a/fs/xfs/xfs_dir2_readdir.c > > > > > > +++ b/fs/xfs/xfs_dir2_readdir.c > > > > > > @@ -69,6 +69,7 @@ xfs_dir2_sf_getdents( > > > > > > xfs_dir2_dataptr_t dotdot_offset; > > > > > > xfs_ino_t ino; > > > > > > struct xfs_da_geometry *geo = args->geo; > > > > > > + char *endp; > > > > > > > > > > > > ASSERT(dp->i_df.if_flags & XFS_IFINLINE); > > > > > > /* > > > > > > @@ -83,6 +84,7 @@ xfs_dir2_sf_getdents( > > > > > > ASSERT(dp->i_df.if_u1.if_data != NULL); > > > > > > > > > > > > sfp = (xfs_dir2_sf_hdr_t *)dp->i_df.if_u1.if_data; > > > > > > + endp = dp->i_df.if_u1.if_data + dp->i_df.if_bytes; > > > > > > > > > > > > if (dp->i_d.di_size < xfs_dir2_sf_hdr_size(sfp->i8count)) > > > > > > return -EFSCORRUPTED; > > > > > > @@ -130,6 +132,12 @@ xfs_dir2_sf_getdents( > > > > > > for (i = 0; i < sfp->count; i++) { > > > > > > __uint8_t filetype; > > > > > > > > > > > > + /* If we pass the end of the buffer, we're done. */ > > > > > > + if (((char *)sfep + sizeof(*sfep)) >= endp || > > > > > > + (char *)dp->d_ops->sf_nextentry(sfp, sfep) > endp) { > > > > > > + break; > > > > > > + } > > > > > > + > > > > > > > > > > What's the reason for checking ->sf_nextentry()? > > > > > > > > struct xfs_dir2_sf_entry (*sfep's type) has a zero-length array for the > > > > entry name at the end of the structure definition. In other words, the > > > > structure effectively has a variable length. Therefore we must first > > > > check that the non-variable parts of the structure don't go off the end > > > > of the array, and then we must check that the name also does not go off > > > > the end of the array, which we do by computing the nextentry pointer. > > > > > > > > (Should I add that as a comment?) > > > > > > > > > > Ok. Yeah, that would be useful. A bit more clear IMO would be to use > > > ->sf_entsize(), if possible, to just verify through the end of the > > > current entry based on the namelen. > > > > <shrug> sf_nextentry() is basically (sfep + sf_entsize()), so I don't think > > it makes much difference. > > > > Yeah. I suggested it because I find it more clear. > > > > I'm also wondering if it's useful to return an error even if the caller > > > might not use it. What about if ctx->pos starts at the entry that > > > crosses the data fork boundary, for example? > > > > The caller won't see it at all -- I tried returning -EFSCORRUPTED but > > the VFS ignores that once we start calling dir_emit, apparently because > > we've already started writing to the userspace buffer, and partial > > result trumps error codes. Maybe we should fix the VFS too, but it will > > take time (or a hallway BoF next week) for me to understand the VFS code > > well enough to produce a patch. In the meantime this allows me to get > > through a entire auto group xfstests run without crashing, because I > > did not succeed in moving xfs/348 out of the auto group. > > > > I'm talking about covering the case where we haven't yet emitted any > data. AFAICT, readdir()/getdents() don't override error in that case. > Granted, if we're walking through a completely bogus buffer (with > respect to the assumption of a directory), then I guess there's no > guarantee the ctx->pos updates are going to honor the associated > expectations either. Yeah. Probably better just to fail before we start emitting directory entries since everything is being read out of a single buffer anyway. > > The reason for breaking out of the loop and setting ctx->pos the way we > > do is (I think) because if userspace sees that pos < len then it will > > keep calling getdents trying to read to the end of the buffer. Since > > the VFS eats the EFSCORRUPTED if we've already emitted the dot/dotdot > > entries, we can't return an error code to userspace, so the only option > > left is to allow ctx->pos to get set to a value high enough that > > userspace won't come back. > > > > I'm not sure a userspace app will care as much about the pos vs. the > buffer len as opposed to the eof semantics of getdents(), though I > haven't dug into it so I could certainly be mistaken. The more I think I noticed that ls -la jams itself into an infinite loop if pos isn't incremented, though I didn't really spend a lot of time figuring out what glibc was actually doing under the covers. > about this, however, the more it seems like this kind of behavior is > still possible with a particularly crafted corruption. > > getdents() looks like it just overwrites the d_off of the last emitted > dirent with the last visited dirent. Even with this change, I don't see > what prevents the last visited dirent offset from being something that > starts the sequence over from the beginning on the next call > (considering a zero return designates eof). > > IOW, it seems like we're playing whack-a-mole here. The fundamental > problem seems to be that we have no type-specific verification of local > format inodes like we do for buffers. E.g., I presume a non-local format > inode wouldn't get past the directory verifier in this situation. I'm <nod> I've changed my mind, so I agree with you. We're better off verifying the inline data contents when we read the fork off disk and again before we write it to disk, similar to how the buffer verifiers work. > wondering if the proper solution here is to start factoring in local > format verifiers for the associated data forks. A short term hack may be > to embed such a verifier call right in dir2_sf_getdents() (downside > being we'd call it on every readdir(), but I doubt that has much of an > impact). Longer term, wire those calls up somehow or another during data > fork initialization of local format inodes and invoke the write side at > xfs_iflush_fork() time. Thoughts? So I actually tried implementing a generic inline dir verifier function and inserted calls it in xfs_iformat_local() and xfs_iflush_fork(). Assuming we extend iflush_fork to return error codes, this appears have the intended effect of keeping people out of corrupt inline directories. I'll give this a spin overnight and we'll see if anything crops up. --D > > Brian > > > --D > > > > > > > > Brian > > > > > > > --D > > > > > > > > > > > > > > Brian > > > > > > > > > > > off = xfs_dir2_db_off_to_dataptr(geo, geo->datablk, > > > > > > xfs_dir2_sf_get_offset(sfep)); > > > > > > > > > > > > -- > > > > > > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > > > > > > the body of a message to majordomo@vger.kernel.org > > > > > > More majordomo info at http://vger.kernel.org/majordomo-info.html > > > > > -- > > > > > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > > > > > the body of a message to majordomo@vger.kernel.org > > > > > More majordomo info at http://vger.kernel.org/majordomo-info.html > > > > -- > > > > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > > > > the body of a message to majordomo@vger.kernel.org > > > > More majordomo info at http://vger.kernel.org/majordomo-info.html > > > -- > > > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > > > the body of a message to majordomo@vger.kernel.org > > > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c index 003a99b..70bdd21 100644 --- a/fs/xfs/xfs_dir2_readdir.c +++ b/fs/xfs/xfs_dir2_readdir.c @@ -69,6 +69,7 @@ xfs_dir2_sf_getdents( xfs_dir2_dataptr_t dotdot_offset; xfs_ino_t ino; struct xfs_da_geometry *geo = args->geo; + char *endp; ASSERT(dp->i_df.if_flags & XFS_IFINLINE); /* @@ -83,6 +84,7 @@ xfs_dir2_sf_getdents( ASSERT(dp->i_df.if_u1.if_data != NULL); sfp = (xfs_dir2_sf_hdr_t *)dp->i_df.if_u1.if_data; + endp = dp->i_df.if_u1.if_data + dp->i_df.if_bytes; if (dp->i_d.di_size < xfs_dir2_sf_hdr_size(sfp->i8count)) return -EFSCORRUPTED; @@ -130,6 +132,12 @@ xfs_dir2_sf_getdents( for (i = 0; i < sfp->count; i++) { __uint8_t filetype; + /* If we pass the end of the buffer, we're done. */ + if (((char *)sfep + sizeof(*sfep)) >= endp || + (char *)dp->d_ops->sf_nextentry(sfp, sfep) > endp) { + break; + } + off = xfs_dir2_db_off_to_dataptr(geo, geo->datablk, xfs_dir2_sf_get_offset(sfep));
Check that we don't run off the end of the inline data buffer when we're trying to read directory entries. xfs/348 triggered kernel memory being exposed to userspace and a related complaint from the usercopy code. Evidently once we call dir_emit, the VFS ignores error return values since it's already begun copying data back to userspace. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> --- fs/xfs/xfs_dir2_readdir.c | 8 ++++++++ 1 file changed, 8 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html