History

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

Pull /dev/random fix from Ted Ts'o: "Fix a BUG splat found by trinity" * tag 'random_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random: random: check for increase of entropy_count because of signed conversion

Linus Torvalds committed 12 years ago

Commit b8d2d122 parents 4e10627 79a84681 file · +14 −3Browse files

Unified · Split

drivers/char/random.c+14−3
@@ -641,7 +641,7 @@ retry: · 640 unmodified lines
641 } while (unlikely(entropy_count < pool_size-2 && pnfrac));641 } while (unlikely(entropy_count < pool_size-2 && pnfrac));
642 }642 }
643 643
644 if (entropy_count < 0) {644 if (unlikely(entropy_count < 0)) {
645 pr_warn("random: negative entropy/overflow: pool %s count %d\n",645 pr_warn("random: negative entropy/overflow: pool %s count %d\n",
646 r->name, entropy_count);646 r->name, entropy_count);
647 WARN_ON(1);647 WARN_ON(1);
@@ -981,7 +981,7 @@ static size_t account(struct entropy_store *r, size_t nbytes, int min, · 333 unmodified lines
981 int reserved)981 int reserved)
982{982{
983 int entropy_count, orig;983 int entropy_count, orig;
984 size_t ibytes;984 size_t ibytes, nfrac;
985 985
986 BUG_ON(r->entropy_count > r->poolinfo->poolfracbits);986 BUG_ON(r->entropy_count > r->poolinfo->poolfracbits);
987 987
@@ -999,7 +999,17 @@ retry: · 11 unmodified lines
999 }999 }
1000 if (ibytes < min)1000 if (ibytes < min)
1001 ibytes = 0;1001 ibytes = 0;
1002 if ((entropy_count -= ibytes << (ENTROPY_SHIFT + 3)) < 0)1002
1003 if (unlikely(entropy_count < 0)) {
1004 pr_warn("random: negative entropy count: pool %s count %d\n",
1005 r->name, entropy_count);
1006 WARN_ON(1);
1007 entropy_count = 0;
1008 }
1009 nfrac = ibytes << (ENTROPY_SHIFT + 3);
1010 if ((size_t) entropy_count > nfrac)
1011 entropy_count -= nfrac;
1012 else
1003 entropy_count = 0;1013 entropy_count = 0;
1004 1014
1005 if (cmpxchg(&r->entropy_count, orig, entropy_count) != orig)1015 if (cmpxchg(&r->entropy_count, orig, entropy_count) != orig)
@@ -1376,6 +1386,7 @@ urandom_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos) · 370 unmodified lines
1376 "with %d bits of entropy available\n",1386 "with %d bits of entropy available\n",
1377 current->comm, nonblocking_pool.entropy_total);1387 current->comm, nonblocking_pool.entropy_total);
1378 1388
1389 nbytes = min_t(size_t, nbytes, INT_MAX >> (ENTROPY_SHIFT + 3));
1379 ret = extract_entropy_user(&nonblocking_pool, buf, nbytes);1390 ret = extract_entropy_user(&nonblocking_pool, buf, nbytes);
1380 1391
1381 trace_urandom_read(8 * nbytes, ENTROPY_BITS(&nonblocking_pool),1392 trace_urandom_read(8 * nbytes, ENTROPY_BITS(&nonblocking_pool),

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t