Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 298a2d87 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-4.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu 

Pull percpu fix from Tejun Heo:
 "Douglas found and fixed a ref leak bug in percpu_ref_tryget[_live]().

  The bug is caused by storing the return value of atomic_long_inc_not_zero()
  into an int temp variable before returning it as a bool. The interim
  cast to int loses the upper bits and can lead to false negatives. As
  percpu_ref uses a high bit to mark a draining counter, this can happen
  relatively easily.

  Fixed by using bool for the temp variable"

* 'for-4.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
  percpu-refcount: fix reference leak during percpu-atomic transition
parents 52e02f27 966d2b04

include/linux/percpu-refcount.h

+2 −2
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ static inline void percpu_ref_get(struct percpu_ref *ref) 
static inline bool percpu_ref_tryget(struct percpu_ref *ref)

{

	unsigned long __percpu *percpu_count;

	int ret;

	bool ret;



	rcu_read_lock_sched();
@@ -238,7 +238,7 @@ static inline bool percpu_ref_tryget(struct percpu_ref *ref) 
static inline bool percpu_ref_tryget_live(struct percpu_ref *ref)

{

	unsigned long __percpu *percpu_count;

	int ret = false;

	bool ret = false;



	rcu_read_lock_sched();