| Message ID | YpzcY0ockNGsv5PR@magnolia (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] xfs: fix TOCTOU race involving the new logged xattrs control knob | expand |
On Sun, Jun 05, 2022 at 09:40:03AM -0700, Darrick J. Wong wrote: > From: Darrick J. Wong <djwong@kernel.org> > > The variable @args is fed to a tracepoint, and that's the only place > it's used. This is fine for the kernel, but for userspace, tracepoints > are #define'd out of existence, which results in this warning on gcc > 11.2: > > xfs_attr.c: In function ‘xfs_attr_node_try_addname’: > xfs_attr.c:1440:42: warning: unused variable ‘args’ [-Wunused-variable] > 1440 | struct xfs_da_args *args = attr->xattri_da_args; > | ^~~~ > > Clean this up. > > Signed-off-by: Darrick J. Wong <djwong@kernel.org> > --- > fs/xfs/libxfs/xfs_attr.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) Yeah, I noticed this in the xfsprogs libxfs port and fixed it there on the port by converting the xfs_attr3_leaf_add(... state->args) parameter to use args. This way works too, and the xfsprogs libxfs can easily be cleaned up in the next xfsprogs libxfs sync. Reviewed-by: Dave Chinner <dchinner@redhat.com>
diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c index 836ab1b8ed7b..acbd7dbd2281 100644 --- a/fs/xfs/libxfs/xfs_attr.c +++ b/fs/xfs/libxfs/xfs_attr.c @@ -1439,12 +1439,11 @@ static int xfs_attr_node_try_addname( struct xfs_attr_intent *attr) { - struct xfs_da_args *args = attr->xattri_da_args; struct xfs_da_state *state = attr->xattri_da_state; struct xfs_da_state_blk *blk; int error; - trace_xfs_attr_node_addname(args); + trace_xfs_attr_node_addname(state->args); blk = &state->path.blk[state->path.active-1]; ASSERT(blk->magic == XFS_ATTR_LEAF_MAGIC);