Linus Torvalds
3e9a97082f
This patch series contains a major revamp of how we collect entropy ...
from interrupts for /dev/random and /dev/urandom. The goal is to
addresses weaknesses discussed in the paper "Mining your Ps and Qs:
Detection of Widespread Weak Keys in Network Devices", by Nadia
Heninger, Zakir Durumeric, Eric Wustrow, J. Alex Halderman, which will
be published in the Proceedings of the 21st Usenix Security Symposium,
August 2012. (See https://factorable.net for more information and an
extended version of the paper.)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIcBAABCAAGBQJQF/0DAAoJENNvdpvBGATwIowQAOep9QKtLrBvb2lwIRVmeiy8
lRf7V/tYZnz4FePbR0W92JQfKYkCV8yyOO0bmeRzWL3v4m+lRwDTSyA1DDyQMoH+
LOMzvDKSLJMSXTXdSOIr1WYACphViCR/9CrbMBCKSkYfZLJ1MdaEDxT3rcpTGD0T
6iknUweiSkHHhkerU5yQL7FKzD5kYUe0hsF47w7QVlHRHJsW2fsZqkFoh+RpnhNw
03u+djxNGBo9qV81vZ9D1b0vA9uRlEjoWOOEG2XE4M2iq6TUySueA72dQnCwunfi
3kG/u1Swv2dgq6aRrP3H7zdwhYSourGxziu3jNhEKwKEohrxYY7xjNX3RVeTqP67
AzlKsOTWpRLIDrzjSLlb8VxRQiZewu8Unex3e1G+eo20sbcIObHGrxNp7K00zZvd
QZiMHhOwItwFTe4lBO+XbqH2JKbL9/uJmwh5EipMpQTraKO9E6N3CJiUHjzBLo2K
iGDZxRMKf4gVJRwDxbbP6D70JPVu8ZJ09XVIpsXQ3Z1xNqaMF0QdCmP3ty56q1o0
NvkSXxPKrijZs8Sk0rVDqnJ3ll8PuDnXMv5eDtL42VT818I5WxESn9djjwEanGv0
TYxbFub/NRxmPEE5B2Js5FBpqsLf5f282OSMeS/5WLBbnHJR1OoPoAhGVpHvxntC
bi5FC1OolqhvzVIdsqgt
=u7KM
-----END PGP SIGNATURE-----
Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random
Pull random subsystem patches from Ted Ts'o:
"This patch series contains a major revamp of how we collect entropy
from interrupts for /dev/random and /dev/urandom.
The goal is to addresses weaknesses discussed in the paper "Mining
your Ps and Qs: Detection of Widespread Weak Keys in Network Devices",
by Nadia Heninger, Zakir Durumeric, Eric Wustrow, J. Alex Halderman,
which will be published in the Proceedings of the 21st Usenix Security
Symposium, August 2012. (See https://factorable.net for more
information and an extended version of the paper.)"
Fix up trivial conflicts due to nearby changes in
drivers/{mfd/ab3100-core.c, usb/gadget/omap_udc.c}
* tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random: (33 commits)
random: mix in architectural randomness in extract_buf()
dmi: Feed DMI table to /dev/random driver
random: Add comment to random_initialize()
random: final removal of IRQF_SAMPLE_RANDOM
um: remove IRQF_SAMPLE_RANDOM which is now a no-op
sparc/ldc: remove IRQF_SAMPLE_RANDOM which is now a no-op
[ARM] pxa: remove IRQF_SAMPLE_RANDOM which is now a no-op
board-palmz71: remove IRQF_SAMPLE_RANDOM which is now a no-op
isp1301_omap: remove IRQF_SAMPLE_RANDOM which is now a no-op
pxa25x_udc: remove IRQF_SAMPLE_RANDOM which is now a no-op
omap_udc: remove IRQF_SAMPLE_RANDOM which is now a no-op
goku_udc: remove IRQF_SAMPLE_RANDOM which was commented out
uartlite: remove IRQF_SAMPLE_RANDOM which is now a no-op
drivers: hv: remove IRQF_SAMPLE_RANDOM which is now a no-op
xen-blkfront: remove IRQF_SAMPLE_RANDOM which is now a no-op
n2_crypto: remove IRQF_SAMPLE_RANDOM which is now a no-op
pda_power: remove IRQF_SAMPLE_RANDOM which is now a no-op
i2c-pmcmsp: remove IRQF_SAMPLE_RANDOM which is now a no-op
input/serio/hp_sdc.c: remove IRQF_SAMPLE_RANDOM which is now a no-op
mfd: remove IRQF_SAMPLE_RANDOM which is now a no-op
...
2012-07-31 19:07:42 -07:00
bcma: cc: update defines
2012-07-17 15:11:37 -04:00
can: mark bittiming_const pointer in struct can_priv as const
2012-07-20 12:31:05 +02:00
libceph: clean up con flags
2012-07-30 18:16:01 -07:00
libceph: support crush tunables
2012-07-30 18:15:23 -07:00
extcon: spelling of detach in function doc
2012-07-17 09:32:14 -07:00
The tag contains just a few battery-related changes for v3.6. It's is
2012-07-31 18:08:25 -07:00
Input: add driver for FT5x06 based EDT displays
2012-07-24 23:55:03 -07:00
LockD: pass actual network namespace to grace period management functions
2012-07-27 16:49:22 -04:00
MFD bits for the 3.6 merge window.
2012-07-30 12:41:17 -07:00
InfiniBand/RDMA changes for the 3.6 merge window:
2012-07-24 13:56:26 -07:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-07-24 17:12:54 -07:00
The tag contains just a few battery-related changes for v3.6. It's is
2012-07-31 18:08:25 -07:00
The tag contains just a few battery-related changes for v3.6. It's is
2012-07-31 18:08:25 -07:00
Merge branch 'regulator-drivers' into regulator-next
2012-07-22 19:32:00 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2012-07-26 12:59:53 -07:00
Merge branch 'nfsd-next' of git://linux-nfs.org/~bfields/linux
2012-07-31 14:42:28 -07:00
USB patches for 3.6-rc1
2012-07-26 10:23:47 -07:00
Merge branch 'linux-next' of git://cavan.codon.org.uk/platform-drivers-x86
2012-07-30 11:54:53 -07:00
include/linux/aio.h: cpp->C conversions
2012-07-30 17:25:21 -07:00
[SCSI] async: make async_synchronize_full() flush all work regardless of domain
2012-07-20 09:07:37 +01:00
PM: Rename CAP_EPOLLWAKEUP to CAP_BLOCK_SUSPEND
2012-07-17 21:37:27 +02:00
clk: add non CONFIG_HAVE_CLK routines
2012-07-30 17:25:11 -07:00
ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION
2012-07-30 17:25:21 -07:00
workqueue: perform cpu down operations from low priority cpu_notifier()
2012-07-17 12:39:26 -07:00
net/rps: Protect cpu_rmap.h from double inclusion
2012-07-19 08:34:37 -07:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-07-26 14:28:55 -07:00
cpumask: cpulist_parse() comments correction
2012-07-27 09:29:42 +09:30
cpusets, hotplug: Restructure functions that are invoked during hotplug
2012-07-24 13:53:22 +02:00
stop passing nameidata * to ->d_revalidate()
2012-07-14 16:34:14 +04:00
dm thin: commit before gathering status
2012-07-27 15:08:16 +01:00
Driver core merge for 3.6-rc1
2012-07-26 11:25:33 -07:00
dm thin: commit before gathering status
2012-07-27 15:08:16 +01:00
common: DMA-mapping: add DMA_ATTR_SKIP_CPU_SYNC attribute
2012-07-30 12:25:47 +02:00
common: dma-mapping: introduce dma_get_sgtable() function
2012-07-30 12:25:46 +02:00
ARM: socfpga: initial support for Altera's SOCFPGA platform
2012-07-19 10:39:00 +02:00
etherdevice: Rename random_ether_addr to eth_random_addr
2012-07-16 22:38:27 -07:00
PM: Rename CAP_EPOLLWAKEUP to CAP_BLOCK_SUSPEND
2012-07-17 21:37:27 +02:00
switch fput to task_work_add
2012-07-22 23:57:58 +04:00
- Small fixes and optimizations.
2012-07-30 09:32:39 -07:00
Merge branch 'nfsd-next' of git://linux-nfs.org/~bfields/linux
2012-07-31 14:42:28 -07:00
genetlink: define lockdep_genl_is_held() when CONFIG_LOCKDEP
2012-07-24 00:01:30 -07:00
driver-core: Move kobj_to_dev from genhd.h to device.h
2012-07-16 18:05:45 -07:00
highmem: remove the deprecated form of kmap_atomic
2012-07-24 15:27:27 +08:00
i2c: i2c-ocores: support for 16bit and 32bit IO
2012-07-14 13:30:25 +02:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-07-30 19:03:41 -07:00
rtnl: allow to specify number of rx and tx queues on device creation
2012-07-20 11:07:00 -07:00
team: add multiqueue support
2012-07-20 11:07:00 -07:00
net/ipv4: VTI support new module for ip_vti.
2012-07-18 09:36:12 -07:00
init: add comments to keep initcall-names in sync with initcall levels
2012-07-27 09:29:42 +09:30
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-07-26 13:08:01 -07:00
random: final removal of IRQF_SAMPLE_RANDOM
2012-07-19 10:40:42 -04:00
Merge branches 'iommu/fixes', 'x86/amd', 'groups', 'arm/tegra' and 'api/domain-attr' into next
2012-07-23 12:17:00 +02:00
ipv6: fix inet6_csk_xmit()
2012-07-18 08:59:58 -07:00
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-07-22 12:19:36 -07:00
random: remove rand_initialize_irq()
2012-07-19 10:38:32 -04:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-07-30 19:03:41 -07:00
printk: remove the now unnecessary "C" annotation for KERN_CONT
2012-07-30 17:25:14 -07:00
Remove SYSTEM_SUSPEND_DISK system state
2012-07-21 13:58:17 -07:00
KEYS: linux/key-type.h needs linux/errno.h
2012-07-30 15:08:46 +10:00
printk: Implement some unlocked kmsg_dump functions
2012-07-21 10:34:00 -07:00
kthread_worker: reimplement flush_kthread_work() to allow freeing the work item being executed
2012-07-22 10:15:28 -07:00
KVM updates for the 3.6 merge window
2012-07-24 12:01:20 -07:00
leds: Rename led_brightness_set() to led_set_brightness()
2012-07-24 07:52:34 +08:00
Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream
2012-07-25 15:58:48 -04:00
of/lib: Allow scripts/dtc/libfdt to be used from kernel code
2012-07-23 13:54:52 +01:00
of/lib: Allow scripts/dtc/libfdt to be used from kernel code
2012-07-23 13:54:52 +01:00
xen/mce: Add mcelog support for Xen platform
2012-07-19 15:51:36 -04:00
Merge branch 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux
2012-07-30 11:32:24 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-07-24 13:34:56 -07:00
fs: add nd_jump_link
2012-07-14 16:35:40 +04:00
net: netprio_cgroup: rework update socket logic
2012-07-22 12:44:01 -07:00
net: honour netif_set_real_num_tx_queues() retval
2012-07-20 11:06:59 -07:00
netpoll: move np->dev and np->dev_name init into __netpoll_setup()
2012-07-17 09:02:36 -07:00
NFS: Convert v4 into a module
2012-07-30 19:06:52 -04:00
NFS: Convert v4 into a module
2012-07-30 19:06:52 -04:00
NFS: Convert v4 into a module
2012-07-30 19:06:52 -04:00
NFS: Convert v4 into a module
2012-07-30 19:06:52 -04:00
nilfs2: add omitted comments for structures in nilfs2_fs.h
2012-07-30 17:25:19 -07:00
cfg80211: add cellular base station regulatory hint support
2012-07-17 12:16:39 +02:00
Merge branch 'for-3.6' of git://gitorious.org/linux-pwm/linux-pwm
2012-07-30 09:22:37 -07:00
Merge branches 'iommu/fixes', 'x86/amd', 'groups', 'arm/tegra' and 'api/domain-attr' into next
2012-07-23 12:17:00 +02:00
Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-07-22 16:07:45 -07:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2012-07-26 14:18:18 -07:00
pipe: remove KM_USER0 from comments
2012-07-24 15:27:34 +08:00
PM / QoS: Use NULL pointer instead of plain integer in pm_qos.h
2012-07-19 00:02:30 +02:00
posix_types.h: Cleanup stale __NFDBITS and related definitions
2012-07-26 13:36:43 -07:00
power_supply: Add min/max alert properties for CAPACITY, TEMP, TEMP_AMBIENT
2012-07-13 20:41:58 -07:00
printk: remove the now unnecessary "C" annotation for KERN_CONT
2012-07-30 17:25:14 -07:00
pstore: Headers should include all stuff they use
2012-07-17 12:15:30 -07:00
pstore/ram: Make tracing log versioned
2012-07-17 16:48:09 -07:00
pwm-backlight: Add rudimentary device tree support
2012-07-23 13:23:52 +02:00
quota: Split dquot_quota_sync() to writeback and cache flushing part
2012-07-22 23:58:19 +04:00
quota: Split dquot_quota_sync() to writeback and cache flushing part
2012-07-22 23:58:19 +04:00
random: remove rand_initialize_irq()
2012-07-19 10:38:32 -04:00
Merge branches 'regmap-core', 'regmap-irq' and 'regmap-page' into regmap-next
2012-07-22 19:26:07 +01:00
remoteproc: Support custom firmware handlers
2012-07-15 11:39:01 +03:00
scatterlist: add sg_alloc_table_from_pages function
2012-07-30 12:25:44 +02:00
NMI watchdog: fix for lockup detector breakage on resume
2012-07-30 17:25:13 -07:00
serial/8250: Add LPC3220 standard UART type
2012-07-26 13:37:02 -07:00
dma: sh: provide a migration path for slave drivers to stop using .private
2012-07-20 11:28:20 +05:30
dma: sh: provide a migration path for slave drivers to stop using .private
2012-07-20 11:28:20 +05:30
ipc: add COMPAT_SHMLBA support
2012-07-30 17:25:20 -07:00
skbuff: add an api to orphan frags
2012-07-22 12:39:33 -07:00
net-tcp: Fast Open client - sending SYN-data
2012-07-19 11:02:03 -07:00
net: make sock diag per-namespace
2012-07-16 22:31:34 -07:00
net-tcp: Fast Open client - sendmsg(MSG_FASTOPEN)
2012-07-19 11:02:03 -07:00
string: introduce memweight()
2012-07-30 17:25:16 -07:00
merge task_work and rcu_head, get rid of separate allocation for keyring case
2012-07-22 23:57:56 +04:00
tcp: dont drop MTU reduction indications
2012-07-23 00:58:46 -07:00
The tag contains just a few battery-related changes for v3.6. It's is
2012-07-31 18:08:25 -07:00
posix_types.h: Cleanup stale __NFDBITS and related definitions
2012-07-26 13:36:43 -07:00
tipc: remove print_buf and deprecated log buffer code
2012-07-13 19:34:43 -04:00
trim task_work: get rid of hlist
2012-07-22 23:57:55 +04:00
merge task_work and rcu_head, get rid of separate allocation for keyring case
2012-07-22 23:57:56 +04:00
USB: add USB_VENDOR_AND_INTERFACE_INFO() macro
2012-07-16 17:43:04 -07:00
[SCSI] usb-storage: add support for write cache quirk
2012-07-20 08:59:00 +01:00
[media] v4l2: Add rangelow and rangehigh fields to the v4l2_hw_freq_seek struct
2012-07-30 20:23:11 -03:00
[SCSI] virtio-scsi: Add vdrv->scan for post VIRTIO_CONFIG_S_DRIVER_OK LUN scanning
2012-07-20 08:59:03 +01:00
virtio-blk: return VIRTIO_BLK_F_FLUSH to header.
2012-07-30 13:30:52 +09:30
virtio ids: fix comment for virtio-rng
2012-07-30 13:30:49 +09:30
[SCSI] virtio-scsi: hotplug support for virtio-scsi
2012-07-20 08:58:58 +01:00
ARM: dma-mapping: remove custom consistent dma region
2012-07-30 12:25:45 +02:00
