Commit b84293b2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random 

Pull /dev/random fix from Ted Ts'o:
 "This fixes a BUG_ON-causing regression that was introduced during the
  last merge window"

* tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random:
  random: fix BUG_ON caused by accounting simplification
parents 026d68be f9c6d498

drivers/char/random.c

+5 −2
Original line number Diff line number Diff line
@@ -995,8 +995,11 @@ retry: 
		ibytes = min_t(size_t, ibytes, have_bytes - reserved);

	if (ibytes < min)

		ibytes = 0;

	entropy_count = max_t(int, 0,

			      entropy_count - (ibytes << (ENTROPY_SHIFT + 3)));

	if (have_bytes >= ibytes + reserved)

		entropy_count -= ibytes << (ENTROPY_SHIFT + 3);

	else

		entropy_count = reserved << (ENTROPY_SHIFT + 3);



	if (cmpxchg(&r->entropy_count, orig, entropy_count) != orig)

		goto retry;

CRA Git | Maintained and supported by SUSTech CRA and CCSE