Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 1600f9def09de07c5dbeb539e978fa73880690dd

Authored by Linus Torvalds
2 parents 11e39d993d b59ec78cdc
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorri… 

…s/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  keys: don't need to use RCU in keyring_read() as semaphore is held

Showing 1 changed file Side-by-side Diff

security/keys/keyring.c
Diff comments   View file @ 1600f9d
... ... @@ -201,7 +201,7 @@
201 201 int loop, ret;
202 202  
203 203 ret = 0;
204   - klist = rcu_dereference(keyring->payload.subscriptions);
  204 + klist = keyring->payload.subscriptions;
205 205  
206 206 if (klist) {
207 207 /* calculate how much data we could return */