Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge crypto tree to pick up scompress off-by-one patch. The
merge resolution is non-trivial as the dst handling code has been
moved in front of the src.
+10
-4
+4
-4
crypto/scompress.c
+4
-4
crypto/scompress.c
···
202
202
dpage = nth_page(dpage, doff / PAGE_SIZE);
203
203
doff = offset_in_page(doff);
204
204
205
-
n = dlen / PAGE_SIZE;
206
-
n += (offset_in_page(dlen) + doff - 1) / PAGE_SIZE;
205
+
n = (dlen - 1) / PAGE_SIZE;
206
+
n += (offset_in_page(dlen - 1) + doff) / PAGE_SIZE;
207
207
if (PageHighMem(dpage + n) &&
208
208
size_add(doff, dlen) > PAGE_SIZE)
209
209
return -ENOSYS;
···
224
224
spage = nth_page(spage, soff / PAGE_SIZE);
225
225
soff = offset_in_page(soff);
226
226
227
-
n = slen / PAGE_SIZE;
228
-
n += (offset_in_page(slen) + soff - 1) / PAGE_SIZE;
227
+
n = (slen - 1) / PAGE_SIZE;
228
+
n += (offset_in_page(slen - 1) + soff) / PAGE_SIZE;
229
229
if (PageHighMem(nth_page(spage, n)) &&
230
230
size_add(soff, slen) > PAGE_SIZE)
231
231
break;
+6
drivers/crypto/atmel-sha204a.c
+6
drivers/crypto/atmel-sha204a.c
···
163
163
i2c_priv->hwrng.name = dev_name(&client->dev);
164
164
i2c_priv->hwrng.read = atmel_sha204a_rng_read;
165
165
166
+
/*
167
+
* According to review by Bill Cox [1], this HWRNG has very low entropy.
168
+
* [1] https://www.metzdowd.com/pipermail/cryptography/2014-December/023858.html
169
+
*/
170
+
i2c_priv->hwrng.quality = 1;
171
+
166
172
ret = devm_hwrng_register(&client->dev, &i2c_priv->hwrng);
167
173
if (ret)
168
174
dev_warn(&client->dev, "failed to register RNG (%d)\n", ret);