Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1586072

RE: [PATCH 1/7] fs, xfs: convert xfs_bui_log_item.bui_refcount from atomic_t to refcount_t

Show all headers | View raw

> On Tue, Feb 21, 2017 at 05:49:01PM +0200, Elena Reshetova wrote:
> > refcount_t type and corresponding API should be
> > used instead of atomic_t when the variable is used as
> > a reference counter. This allows to avoid accidental
> > refcounter overflows that might lead to use-after-free
> > situations.
> >
> > Signed-off-by: Elena Reshetova <elena.reshetova@intel.com>
> > Signed-off-by: Hans Liljestrand <ishkamiel@gmail.com>
> > Signed-off-by: Kees Cook <keescook@chromium.org>
> > Signed-off-by: David Windsor <dwindsor@gmail.com>
> > ---
> >  fs/xfs/xfs_bmap_item.c | 4 ++--
> >  fs/xfs/xfs_bmap_item.h | 4 +++-
> >  2 files changed, 5 insertions(+), 3 deletions(-)
> >
> > diff --git a/fs/xfs/xfs_bmap_item.c b/fs/xfs/xfs_bmap_item.c
> > index 9bf57c7..33104ad 100644
> > --- a/fs/xfs/xfs_bmap_item.c
> > +++ b/fs/xfs/xfs_bmap_item.c
> > @@ -199,7 +199,7 @@ xfs_bui_init(
> >  	buip->bui_format.bui_nextents =
> XFS_BUI_MAX_FAST_EXTENTS;
> >  	buip->bui_format.bui_id = (uintptr_t)(void *)buip;
> >  	atomic_set(&buip->bui_next_extent, 0);
> > -	atomic_set(&buip->bui_refcount, 2);
> > +	refcount_set(&buip->bui_refcount, 2);
> >
> >  	return buip;
> >  }
> > @@ -215,7 +215,7 @@ void
> >  xfs_bui_release(
> >  	struct xfs_bui_log_item	*buip)
> >  {
> > -	if (atomic_dec_and_test(&buip->bui_refcount)) {
> > +	if (refcount_dec_and_test(&buip->bui_refcount)) {
> >  		xfs_trans_ail_remove(&buip->bui_item,
> SHUTDOWN_LOG_IO_ERROR);
> >  		xfs_bui_item_free(buip);
> >  	}
> > diff --git a/fs/xfs/xfs_bmap_item.h b/fs/xfs/xfs_bmap_item.h
> > index c867daa..988a6ae 100644
> > --- a/fs/xfs/xfs_bmap_item.h
> > +++ b/fs/xfs/xfs_bmap_item.h
> > @@ -20,6 +20,8 @@
> >  #ifndef	__XFS_BMAP_ITEM_H__
> >  #define	__XFS_BMAP_ITEM_H__
> >
> > +#include <linux/refcount.h>
> 
> Seeing as you're sprinkling refcount_t all over XFS, this ought to go in
> xfs_linux.h with all the other Linux-specific #includes.
> 
> --D

Sure, I will move the include there and leave only one. 
Will send a next version also after fixing the other non-reference counters case we discussed. 

Best Regards,
Elena.
> 
> > +
> >  /*
> >   * There are (currently) two pairs of bmap btree redo item types: map &
> unmap.
> >   * The common abbreviations for these are BUI (bmap update intent) and
> BUD
> > @@ -61,7 +63,7 @@ struct kmem_zone;
> >   */
> >  struct xfs_bui_log_item {
> >  	struct xfs_log_item		bui_item;
> > -	atomic_t			bui_refcount;
> > +	refcount_t			bui_refcount;
> >  	atomic_t			bui_next_extent;
> >  	unsigned long			bui_flags;	/* misc
> flags */
> >  	struct xfs_bui_log_format	bui_format;
> > --
> > 2.7.4
> >
> > --
> > 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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/7] fs, xfs subsystem refcounter conversions Elena Reshetova <elena.reshetova@intel.com> - 2017-02-21 16:50 +0100
  [PATCH 1/7] fs, xfs: convert xfs_bui_log_item.bui_refcount from atomic_t to refcount_t Elena Reshetova <elena.reshetova@intel.com> - 2017-02-21 16:50 +0100
    Re: [PATCH 1/7] fs, xfs: convert xfs_bui_log_item.bui_refcount from  atomic_t to refcount_t "Darrick J. Wong" <darrick.wong@oracle.com> - 2017-02-21 17:40 +0100
      RE: [PATCH 1/7] fs, xfs: convert xfs_bui_log_item.bui_refcount from  atomic_t to refcount_t "Reshetova, Elena" <elena.reshetova@intel.com> - 2017-02-22 12:20 +0100
    Re: [PATCH 1/7] fs, xfs: convert xfs_bui_log_item.bui_refcount from  atomic_t to refcount_t Dave Chinner <david@fromorbit.com> - 2017-02-22 00:00 +0100
      RE: [PATCH 1/7] fs, xfs: convert xfs_bui_log_item.bui_refcount from  atomic_t to refcount_t "Reshetova, Elena" <elena.reshetova@intel.com> - 2017-02-22 12:30 +0100
        Re: [PATCH 1/7] fs, xfs: convert xfs_bui_log_item.bui_refcount from  atomic_t to refcount_t Dave Chinner <david@fromorbit.com> - 2017-02-22 23:10 +0100
          RE: [PATCH 1/7] fs, xfs: convert xfs_bui_log_item.bui_refcount from  atomic_t to refcount_t "Reshetova, Elena" <elena.reshetova@intel.com> - 2017-02-23 09:00 +0100
  [PATCH 5/7] fs, xfs: convert xlog_ticket.t_ref from atomic_t to refcount_t Elena Reshetova <elena.reshetova@intel.com> - 2017-02-21 17:00 +0100
  Re: [PATCH 3/7] fs, xfs: convert xfs_buf_log_item.bli_refcount from  atomic_t to refcount_t Peter Zijlstra <peterz@infradead.org> - 2017-02-21 17:00 +0100
    RE: [PATCH 3/7] fs, xfs: convert xfs_buf_log_item.bli_refcount from  atomic_t to refcount_t "Reshetova, Elena" <elena.reshetova@intel.com> - 2017-02-21 17:10 +0100
      Re: [PATCH 3/7] fs, xfs: convert xfs_buf_log_item.bli_refcount from  atomic_t to refcount_t Peter Zijlstra <peterz@infradead.org> - 2017-02-21 17:30 +0100
        Re: [PATCH 3/7] fs, xfs: convert xfs_buf_log_item.bli_refcount from  atomic_t to refcount_t Peter Zijlstra <peterz@infradead.org> - 2017-02-21 17:40 +0100
      Re: [PATCH 3/7] fs, xfs: convert xfs_buf_log_item.bli_refcount from  atomic_t to refcount_t "Darrick J. Wong" <darrick.wong@oracle.com> - 2017-02-21 18:10 +0100
        Re: [PATCH 3/7] fs, xfs: convert xfs_buf_log_item.bli_refcount from  atomic_t to refcount_t Brian Foster <bfoster@redhat.com> - 2017-02-21 20:30 +0100
          RE: [PATCH 3/7] fs, xfs: convert xfs_buf_log_item.bli_refcount from  atomic_t to refcount_t "Reshetova, Elena" <elena.reshetova@intel.com> - 2017-02-22 12:30 +0100
  [PATCH 7/7] fs, xfs: convert xfs_rui_log_item.rui_refcount from atomic_t to refcount_t Elena Reshetova <elena.reshetova@intel.com> - 2017-02-21 17:00 +0100
  [PATCH 4/7] fs, xfs: convert xfs_efi_log_item.efi_refcount from atomic_t to refcount_t Elena Reshetova <elena.reshetova@intel.com> - 2017-02-21 17:00 +0100
  [PATCH 3/7] fs, xfs: convert xfs_buf_log_item.bli_refcount from atomic_t to refcount_t Elena Reshetova <elena.reshetova@intel.com> - 2017-02-21 17:00 +0100
  [PATCH 2/7] fs, xfs: convert xfs_buf.b_hold and xfs_buf.b_lru_ref from atomic_t to refcount_t Elena Reshetova <elena.reshetova@intel.com> - 2017-02-21 17:00 +0100
    Re: [PATCH 2/7] fs, xfs: convert xfs_buf.b_hold and  xfs_buf.b_lru_ref from atomic_t to refcount_t Peter Zijlstra <peterz@infradead.org> - 2017-02-21 17:10 +0100
      Re: [PATCH 2/7] fs, xfs: convert xfs_buf.b_hold and  xfs_buf.b_lru_ref from atomic_t to refcount_t Dave Chinner <david@fromorbit.com> - 2017-02-22 00:00 +0100
        RE: [PATCH 2/7] fs, xfs: convert xfs_buf.b_hold and  xfs_buf.b_lru_ref from atomic_t to refcount_t "Reshetova, Elena" <elena.reshetova@intel.com> - 2017-02-22 12:20 +0100
  [PATCH 6/7] fs, xfs: convert xfs_cui_log_item.cui_refcount from atomic_t to refcount_t Elena Reshetova <elena.reshetova@intel.com> - 2017-02-21 17:00 +0100

csiph-web