Commit 3e9a9708 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 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
  ...
parents 941c8726 d2e7c96a

Documentation/feature-removal-schedule.txt

+0 −14
Original line number Diff line number Diff line
@@ -70,20 +70,6 @@ Who: Luis R. Rodriguez <lrodriguez@atheros.com> 


---------------------------



What:	IRQF_SAMPLE_RANDOM

Check:	IRQF_SAMPLE_RANDOM

When:	July 2009



Why:	Many of IRQF_SAMPLE_RANDOM users are technically bogus as entropy

	sources in the kernel's current entropy model. To resolve this, every

	input point to the kernel's entropy pool needs to better document the

	type of entropy source it actually is. This will be replaced with

	additional add_*_randomness functions in drivers/char/random.c



Who:	Robin Getz <rgetz@blackfin.uclinux.org> & Matt Mackall <mpm@selenic.com>



---------------------------



What:	The ieee80211_regdom module parameter

When:	March 2010 / desktop catchup

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -5682,7 +5682,7 @@ F: Documentation/blockdev/ramdisk.txt 
F:	drivers/block/brd.c



RANDOM NUMBER DRIVER

M:	Matt Mackall <mpm@selenic.com>

M:	Theodore Ts'o" <tytso@mit.edu>

S:	Maintained

F:	drivers/char/random.c

arch/arm/mach-omap1/board-palmz71.c

+1 −2
Original line number Diff line number Diff line
@@ -288,8 +288,7 @@ palmz71_gpio_setup(int early) 
		}

		gpio_direction_input(PALMZ71_USBDETECT_GPIO);

		if (request_irq(gpio_to_irq(PALMZ71_USBDETECT_GPIO),

				palmz71_powercable, IRQF_SAMPLE_RANDOM,

				"palmz71-cable", NULL))

				palmz71_powercable, 0, "palmz71-cable", NULL))

			printk(KERN_ERR

					"IRQ request for power cable failed!\n");

		palmz71_powercable(gpio_to_irq(PALMZ71_USBDETECT_GPIO), NULL);

arch/arm/mach-pxa/lubbock.c

+1 −1
Original line number Diff line number Diff line
@@ -456,7 +456,7 @@ static int lubbock_mci_init(struct device *dev, 
	init_timer(&mmc_timer);

	mmc_timer.data = (unsigned long) data;

	return request_irq(LUBBOCK_SD_IRQ, lubbock_detect_int,

			IRQF_SAMPLE_RANDOM, "lubbock-sd-detect", data);

			   0, "lubbock-sd-detect", data);

}



static int lubbock_mci_get_ro(struct device *dev)

arch/arm/mach-pxa/magician.c

+2 −3
Original line number Diff line number Diff line
@@ -633,8 +633,7 @@ static struct platform_device bq24022 = { 
static int magician_mci_init(struct device *dev,

				irq_handler_t detect_irq, void *data)

{

	return request_irq(IRQ_MAGICIAN_SD, detect_irq,

				IRQF_DISABLED | IRQF_SAMPLE_RANDOM,

	return request_irq(IRQ_MAGICIAN_SD, detect_irq, IRQF_DISABLED,

			   "mmc card detect", data);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE