Linux 4.14.285
Greg Kroah-Hartman
maintainerI'm announcing the release of the 4.14.285 kernel.
All users of the 4.14 kernel series must upgrade.
The updated 4.14.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.14.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/admin-guide/kernel-parameters.txt | 12 Documentation/sysctl/kernel.txt | 35 MAINTAINERS | 1 Makefile | 2 arch/alpha/include/asm/timex.h | 1 arch/arm/include/asm/timex.h | 1 arch/arm64/kernel/ftrace.c | 4 arch/ia64/include/asm/timex.h | 1 arch/m68k/include/asm/timex.h | 2 arch/mips/include/asm/timex.h | 17 arch/nios2/include/asm/timex.h | 3 arch/parisc/include/asm/timex.h | 3 arch/powerpc/include/asm/archrandom.h | 27 arch/powerpc/include/asm/timex.h | 1 arch/s390/include/asm/archrandom.h | 12 arch/s390/include/asm/timex.h | 1 arch/s390/mm/pgtable.c | 2 arch/sparc/include/asm/timex_32.h | 4 arch/um/include/asm/timex.h | 9 arch/x86/include/asm/archrandom.h | 12 arch/x86/include/asm/timex.h | 9 arch/x86/include/asm/tsc.h | 7 arch/xtensa/include/asm/timex.h | 6 certs/blacklist_hashes.c | 2 crypto/chacha20_generic.c | 3 crypto/drbg.c | 220 + crypto/md4.c | 17 crypto/md5.c | 17 drivers/ata/libata-core.c | 4 drivers/char/Kconfig | 38 drivers/char/hw_random/core.c | 1 drivers/char/random.c | 3032 ++++++++---------------- drivers/hv/vmbus_drv.c | 2 drivers/irqchip/irq-gic-realview.c | 1 drivers/misc/atmel-ssc.c | 4 drivers/net/ethernet/broadcom/bgmac-bcma.c | 1 drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 25 drivers/net/ethernet/mediatek/mtk_eth_soc.c | 21 drivers/nfc/nfcmrvl/usb.c | 16 drivers/of/fdt.c | 14 drivers/scsi/ipr.c | 4 drivers/scsi/lpfc/lpfc_nportdisc.c | 3 drivers/scsi/pmcraid.c | 2 drivers/scsi/vmw_pvscsi.h | 4 drivers/staging/comedi/drivers/vmk80xx.c | 2 drivers/tty/goldfish.c | 2 drivers/tty/serial/8250/8250_port.c | 2 drivers/usb/dwc2/hcd.c | 2 drivers/usb/gadget/function/u_ether.c | 11 drivers/usb/gadget/udc/lpc32xx_udc.c | 1 drivers/usb/serial/io_ti.c | 2 drivers/usb/serial/io_usbvend.h | 1 drivers/usb/serial/option.c | 6 drivers/virtio/virtio_mmio.c | 1 drivers/virtio/virtio_pci_common.c | 3 fs/9p/vfs_inode_dotl.c | 10 fs/ext4/mballoc.c | 9 fs/ext4/namei.c | 3 fs/ext4/resize.c | 10 fs/nfs/pnfs.c | 6 include/crypto/blake2s.h | 102 include/crypto/chacha20.h | 17 include/crypto/drbg.h | 18 include/crypto/internal/blake2s.h | 19 include/linux/byteorder/generic.h | 17 include/linux/cpuhotplug.h | 2 include/linux/hw_random.h | 2 include/linux/mm.h | 2 include/linux/prandom.h | 23 include/linux/random.h | 125 include/linux/siphash.h | 28 include/linux/timex.h | 10 include/trace/events/random.h | 316 -- include/uapi/linux/random.h | 4 init/main.c | 18 kernel/cpu.c | 11 kernel/irq/handle.c | 2 kernel/time/timekeeping.c | 16 lib/Kconfig.debug | 5 lib/Makefile | 2 lib/chacha20.c | 6 lib/crypto/Makefile | 7 lib/crypto/blake2s-generic.c | 111 lib/crypto/blake2s-selftest.c | 591 ++++ lib/crypto/blake2s.c | 78 lib/random32.c | 15 lib/sha1.c | 95 lib/siphash.c | 32 mm/util.c | 33 net/ipv4/inet_hashtables.c | 34 net/l2tp/l2tp_ip6.c | 5 net/l2tp/l2tp_ppp.c | 60 net/sunrpc/xprtrdma/rpc_rdma.c | 4 sound/soc/codecs/cs42l52.c | 8 sound/soc/codecs/cs42l56.c | 4 sound/soc/codecs/cs53l30.c | 16 sound/soc/codecs/wm8962.c | 1 97 files changed, 2775 insertions(+), 2738 deletions(-)
Adam Ford (1):
ASoC: wm8962: Fix suspend while playing music
Al Viro (1):
9p: missing chunk of "fs/9p: Don't update file type when updating file attributes"
Aleksandr Loktionov (1):
i40e: Fix call trace in setup_tx_descriptors
Andi Kleen (1):
random: optimize add_interrupt_randomness
Andy Lutomirski (8):
random: Don't wake crng_init_wait when crng_init == 1
random: Add a urandom_read_nowait() for random APIs that don't warn
random: add GRND_INSECURE to return best-effort non-cryptographic bytes
random: ignore GRND_RANDOM in getentropy(2)
random: make /dev/random be almost like /dev/urandom
random: remove the blocking pool
random: delete code to pull data into pools
random: remove kernel.random.read_wakeup_threshold
Andy Shevchenko (1):
crypto: Deduplicate le32_to_cpu_array() and cpu_to_le32_array()
Ard Biesheuvel (1):
random: avoid arch_get_random_seed_long() when collecting IRQ randomness
Baokun Li (1):
ext4: fix bug_on ext4_mb_use_inode_pa
Borislav Petkov (1):
char/random: Add a newline at the end of the file
Charles Keepax (4):
ASoC: cs42l52: Fix TLV scales for mixer controls
ASoC: cs53l30: Correct number of volume levels on SX controls
ASoC: cs42l52: Correct TLV for Bypass Volume
ASoC: cs42l56: Correct typo in minimum level for SX volume controls
Chen Lin (1):
net: ethernet: mtk_eth_soc: fix misuse of mem alloc interface netdev[napi]_alloc_frag
Chengguang Xu (2):
scsi: ipr: Fix missing/incorrect resource cleanup in error case
scsi: pmcraid: Fix missing resource cleanup in error case
Christian Borntraeger (1):
s390/mm: use non-quiescing sske for KVM switch to keyed guest
Christophe JAILLET (1):
net: bgmac: Fix an erroneous kfree() in bgmac_remove()
Colin Ian King (1):
xprtrdma: fix incorrect header size calculations
Ding Xiang (1):
ext4: make variable "count" signed
Dominik Brodowski (7):
random: fix crash on multiple early calls to add_bootloader_randomness()
random: harmonize "crng init done" messages
random: early initialization of ChaCha constants
random: continually use hwgenerator randomness
random: access primary_pool directly rather than through pointer
random: only call crng_finalize_init() for primary_crng
random: fix locking in crng_fast_load()
Eric Biggers (7):
crypto: chacha20 - Fix keystream alignment for chacha20_block()
random: remove dead code left over from blocking pool
crypto: blake2s - include <linux/bug.h> instead of <asm/bug.h>
crypto: blake2s - adjust include guard naming
random: initialize ChaCha20 constants with correct endianness
crypto: chacha20 - Fix chacha20_block() keystream alignment (again)
random: remove use_input_pool parameter from crng_reseed()
Eric Dumazet (1):
tcp: add some entropy in __inet_hash_connect()
George Spelvin (1):
random: document get_random_int() family
Greg Kroah-Hartman (1):
Linux 4.14.285
Herbert Xu (1):
Revert "hwrng: core - Freeze khwrng thread during suspend"
Hsin-Yi Wang (1):
fdt: add support for rng-seed
Ian Abbott (1):
comedi: vmk80xx: fix expression for tx buffer size
Ilpo Järvinen (1):
serial: 8250: Store to lsr_save_flags after lsr read
Ingo Molnar (1):
random: remove preempt disabled region
James Chapman (2):
l2tp: don't use inet_shutdown on ppp session destroy
l2tp: fix race in pppol2tp_release with session object destroy
James Smart (1):
scsi: lpfc: Fix port stuck in bypassed state after LIP in PT2PT topology
Jan Varho (1):
random: do not split fast init input in add_hwgenerator_randomness()
Jann Horn (2):
random: don't reset crng_init_cnt on urandom_read()
random: check for signal_pending() outside of need_resched() check
Jason A. Donenfeld (117):
random: always fill buffer in get_random_bytes_wait
random: Make crng state queryable
crypto: blake2s - generic C library implementation and selftest lib/crypto: blake2s: move hmac construction into wireguard lib/crypto: sha1: re-roll loops to reduce code size
MAINTAINERS: co-maintain random.c
random: use BLAKE2s instead of SHA1 in extraction
random: do not sign extend bytes for rotation when mixing
random: do not re-init if crng_reseed completes before primary init
random: mix bootloader randomness into pool
random: use IS_ENABLED(CONFIG_NUMA) instead of ifdefs
random: avoid superfluous call to RDRAND in CRNG extraction
random: cleanup poolinfo abstraction
random: cleanup integer types
random: remove incomplete last_data logic
random: remove unused extract_entropy() reserved argument
random: rather than entropy_store abstraction, use global
random: remove unused OUTPUT_POOL constants
random: de-duplicate INPUT_POOL constants
random: prepend remaining pool constants with POOL_
random: cleanup fractional entropy shift constants
random: access input_pool_data directly rather than through pointer
random: simplify arithmetic function flow in account()
random: use computational hash for entropy extraction
random: simplify entropy debiting
random: use linear min-entropy accumulation crediting
random: always wake up entropy writers after extraction
random: make credit_entropy_bits() always safe
random: remove batched entropy locking
random: use RDSEED instead of RDRAND in entropy extraction
random: inline leaves of rand_initialize()
random: ensure early RDSEED goes through mixer on init
random: do not xor RDRAND when writing into /dev/random
random: absorb fast pool into input pool after fast load
random: use hash function for crng_slow_load()
random: remove outdated INT_MAX >> 6 check in urandom_read()
random: zero buffer after reading entropy from userspace
random: tie batched entropy generation to base_crng generation
random: remove ifdef'd out interrupt bench
random: remove unused tracepoints
random: add proper SPDX header
random: deobfuscate irq u32/u64 contributions
random: introduce drain_entropy() helper to declutter crng_reseed()
random: remove useless header comment
random: remove whitespace and reorder includes
random: group initialization wait functions
random: group entropy extraction functions
random: group entropy collection functions
random: group userspace read/write functions
random: group sysctl functions
random: rewrite header introductory comment
random: defer fast pool mixing to worker
random: do not take pool spinlock at boot
random: unify early init crng load accounting
random: check for crng_init == 0 in add_device_randomness()
random: pull add_hwgenerator_randomness() declaration into random.h
random: clear fast pool, crng, and batches in cpuhp bring up
random: round-robin registers as ulong, not u32
random: only wake up writers after zap if threshold was passed
random: cleanup UUID handling
random: unify cycles_t and jiffies usage and types
random: do crng pre-init loading in worker rather than irq
random: give sysctl_random_min_urandom_seed a more sensible value
random: don't let 644 read-only sysctls be written to
random: replace custom notifier chain with standard one
random: use SipHash as interrupt entropy accumulator
random: make consistent usage of crng_ready()
random: reseed more often immediately after booting
random: check for signal and try earlier when generating entropy
random: skip fast_init if hwrng provides large chunk of entropy
random: treat bootloader trust toggle the same way as cpu trust toggle
random: re-add removed comment about get_random_{u32,u64} reseeding
random: mix build-time latent entropy into pool at init
random: do not allow user to keep crng key around on stack
random: check for signals every PAGE_SIZE chunk of /dev/[u]random
random: make random_get_entropy() return an unsigned long
random: document crng_fast_key_erasure() destination possibility
random: fix sysctl documentation nits
init: call time_init() before rand_initialize()
ia64: define get_cycles macro for arch-override
s390: define get_cycles macro for arch-override
parisc: define get_cycles macro for arch-override
alpha: define get_cycles macro for arch-override
powerpc: define get_cycles macro for arch-override
timekeeping: Add raw clock fallback for random_get_entropy()
m68k: use fallback for random_get_entropy() instead of zero
mips: use fallback for random_get_entropy() instead of just c0 random
arm: use fallback for random_get_entropy() instead of zero
nios2: use fallback for random_get_entropy() instead of zero x86/tsc: Use fallback for random_get_entropy() instead of zero
um: use fallback for random_get_entropy() instead of zero
sparc: use fallback for random_get_entropy() instead of zero
xtensa: use fallback for random_get_entropy() instead of zero
random: insist on random_get_entropy() existing in order to simplify
random: do not use batches when !crng_ready()
random: do not pretend to handle premature next security model
random: order timer entropy functions below interrupt functions
random: do not use input pool from hard IRQs
random: help compiler out with fast_mix() by using simpler arguments
siphash: use one source of truth for siphash permutations
random: use symbolic constants for crng_init states
random: avoid initializing twice in credit race
random: remove ratelimiting for in-kernel unseeded randomness
random: use proper jiffies comparison macro
random: handle latent entropy and command line from random_init()
random: credit architectural init the exact amount
random: use static branch for crng_ready()
random: remove extern from functions in header
random: use proper return types on get_random_{int,long}_wait()
random: move initialization functions out of hot pages
random: move randomize_page() into mm where it belongs
random: check for signals after page of pool writes
Revert "random: use static branch for crng_ready()"
random: avoid checking crng_ready() twice in random_init()
random: mark bootloader randomness code as __init
random: account for arch randomness in bits
random: credit cpu and bootloader seeds by default
Jens Axboe (2):
random: convert to using fops->write_iter()
random: wire up fops->splice_{read,write}_iter()Kees Cook (2):
random: make CPU trust a boot parameter
random: move rand_initialize() earlier
Linus Torvalds (1):
random: try to actively add entropy rather than passively wait for it
Marian Postevca (1):
usb: gadget: u_ether: fix regression in setting fixed MAC address
Mark Brown (1):
random: document add_hwgenerator_randomness() with other input functions
Mark Rutland (4):
random: split primary/secondary crng init paths
random: avoid warnings for !CONFIG_NUMA builds
random: add arch_get_random_*long_early()
arm64: ftrace: fix branch range checks
Masahiro Yamada (1):
certs/blacklist_hashes.c: fix const confusion in certs blacklist
Miaoqian Lin (4):
misc: atmel-ssc: Fix IRQ check in ssc_probe irqchip/gic/realview: Fix refcount leak in realview_gic_of_init
usb: dwc2: Fix memory leak in dwc2_hcd_init
usb: gadget: lpc32xx_udc: Fix refcount leak in lpc32xx_udc_probe
Murilo Opsfelder Araujo (1):
virtio-pci: Remove wrong address verification in vp_del_vqs()
Nicolai Stange (4):
crypto: drbg - prepare for more fine-grained tracking of seeding state
crypto: drbg - track whether DRBG was seeded with !rng_is_initialized()
crypto: drbg - move dynamic ->reseed_threshold adjustments to __drbg_seed()
crypto: drbg - make reseeding from get_random_bytes() synchronous
Rasmus Villemoes (4):
drivers/char/random.c: remove unused dont_count_entropy drivers/char/random.c: constify poolinfo_table drivers/char/random.c: remove unused stuct poolinfo::poolbits drivers/char/random.c: make primary_crng static
Richard Henderson (7):
x86: Remove arch_has_random, arch_has_random_seed
powerpc: Remove arch_has_random, arch_has_random_seed
s390: Remove arch_has_random, arch_has_random_seed linux/random.h: Remove arch_has_random, arch_has_random_seed linux/random.h: Use false with bool
linux/random.h: Mark CONFIG_ARCH_RANDOM functions __must_check
powerpc: Use bool in archrandom.h
Robert Eckelmann (1):
USB: serial: io_ti: add Agilent E5805A support
Schspa Shi (1):
random: fix typo in comments
Sebastian Andrzej Siewior (1):
random: remove unused irq_flags argument from add_interrupt_randomness()
Sergey Senozhatsky (1):
char/random: silence a lockdep splat with printk()
Sergey Shtylyov (1):
ata: libata-core: fix NULL pointer deref in ata_host_alloc_pinfo()
Slark Xiao (1):
USB: serial: option: add support for Cinterion MV31 with new baseline
Stephan Mueller (1):
crypto: drbg - add FIPS 140-2 CTRNG for noise source
Stephan Müller (2):
crypto: drbg - always seeded with SP800-90B compliant noise source
crypto: drbg - always try to free Jitter RNG instance
Stephen Boyd (2):
random: Support freezable kthreads in add_hwgenerator_randomness()
random: Use wait_event_freezable() in add_hwgenerator_randomness()
Theodore Ts'o (3):
random: add a config option to trust the CPU's hwrng
random: only read from /dev/random after its pool has received 128 bits
random: fix soft lockup when trying to read from an uninitialized blocking pool
Tobin C. Harding (2):
random: Fix whitespace pre random-bytes work
random: Return nbytes filled from hw RNG
Trond Myklebust (1):
pNFS: Don't keep retrying if the server replied NFS4ERR_LAYOUTUNAVAILABLE
Vasily Gorbik (1):
latent_entropy: avoid build error when plugin cflags are not set
Vincent Whitchurch (1):
tty: goldfish: Fix free_irq() on remove
Wang Yufen (1):
ipv6: Fix signed integer overflow in l2tp_ip6_sendmsg
Wentao Wang (1):
scsi: vmw_pvscsi: Expand vcpuHint to 16 bits
Willy Tarreau (5):
tcp: use different parts of the port_offset for index and offset
tcp: add small random increments to the source port
tcp: dynamically allocate the perturb table used by source ports
tcp: increase source port perturb table to 2^16
tcp: drop the hash_32() part from the index calculation
Xiaohui Zhang (1):
nfc: nfcmrvl: Fix memory leak in nfcmrvl_play_deferred
Yangtao Li (5):
random: remove unnecessary unlikely()
random: convert to ENTROPY_BITS for better code readability
random: Add and use pr_fmt()
random: fix typo in add_timer_randomness()
random: remove some dead code of poolinfo
Zhang Yi (1):
ext4: add reserved GDT blocks check
chengkaitao (1):
virtio-mmio: fix missing put_device() when vm_cmdline_parent registration failed
Greg Kroah-Hartman
maintainerDocumentation/admin-guide/kernel-parameters.txt +12 -0
@@ -3526,6 +3526,18 @@ ramdisk_size= [RAM] Sizes of RAM disks in kilobytes See Documentation/blockdev/ramdisk.txt. + random.trust_cpu={on,off} + [KNL] Enable or disable trusting the use of the + CPU's random number generator (if available) to + fully seed the kernel's CRNG. Default is controlled + by CONFIG_RANDOM_TRUST_CPU. + + random.trust_bootloader={on,off} + [KNL] Enable or disable trusting the use of a + seed passed by the bootloader (if available) to + fully seed the kernel's CRNG. Default is controlled + by CONFIG_RANDOM_TRUST_BOOTLOADER. + ras=option[,option,...] [KNL] RAS-specific options cec_disable [X86]
Documentation/sysctl/kernel.txt +33 -2
@@ -781,9 +781,40 @@ The kernel command line parameter printk.devkmsg= overrides this and is a one-time setting until next reboot: once set, it cannot be changed by this sysctl interface anymore. -============================================================== +pty +=== + +See Documentation/filesystems/devpts.rst. + + +random +====== + +This is a directory, with the following entries: + +* ``boot_id``: a UUID generated the first time this is retrieved, and + unvarying after that; + +* ``uuid``: a UUID generated every time this is retrieved (this can + thus be used to generate UUIDs at will); + +* ``entropy_avail``: the pool's entropy count, in bits; + +* ``poolsize``: the entropy pool size, in bits; + +* ``urandom_min_reseed_secs``: obsolete (used to determine the minimum + number of seconds between urandom pool reseeding). This file is + writable for compatibility purposes, but writing to it has no effect + on any RNG behavior; + +* ``write_wakeup_threshold``: when the entropy count drops below this + (as a number of bits), processes waiting to write to ``/dev/random`` + are woken up. This file is writable for compatibility purposes, but + writing to it has no effect on any RNG behavior. + -randomize_va_space: +randomize_va_space +================== This option can be used to select the type of process address space randomization that is used in the system, for architectures
MAINTAINERS +1 -0
@@ -11307,6 +11307,7 @@ F: drivers/block/brd.c RANDOM NUMBER DRIVER M: "Theodore Ts'o" <[email protected]> +M: Jason A. Donenfeld <[email protected]> S: Maintained F: drivers/char/random.c
Makefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 14 -SUBLEVEL = 284 +SUBLEVEL = 285 EXTRAVERSION = NAME = Petit Gorille
arch/alpha/include/asm/timex.h +1 -0
@@ -28,5 +28,6 @@ static inline cycles_t get_cycles (void) __asm__ __volatile__ ("rpcc %0" :"=r" (ret)); return ret; } +#define get_cycles get_cycles#endif
arch/arm/include/asm/timex.h +1 -0
@@ -14,5 +14,6 @@typedef unsigned long cycles_t ;#define get_cycles () ({ cycles_t c; read_current_timer(&c) ? 0 : c; }) +#define random_get_entropy () (((unsigned long)get_cycles()) ?: random_get_entropy_fallback())#endif
arch/arm64/kernel/ftrace.c +2 -2
@@ -72,7 +72,7 @@ int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) {unsigned long pc = rec->ip;u32 old, new; -long offset = (long )pc - (long )addr; +long offset = (long )addr - (long )pc;if (offset < -SZ_128M || offset >=SZ_128M ) {#ifdef CONFIG_ARM64_MODULE_PLTS
@@ -151,7 +151,7 @@ int ftrace_make_nop(struct module *mod, struct dyn_ftrace *rec,unsigned long pc = rec->ip;bool validate = true;u32 old =0 , new; -long offset = (long )pc - (long )addr; +long offset = (long )addr - (long )pc;if (offset < -SZ_128M || offset >=SZ_128M ) {#ifdef CONFIG_ARM64_MODULE_PLTS
arch/ia64/include/asm/timex.h +1 -0
@@ -39,6 +39,7 @@ get_cycles (void) ret =ia64_getreg (_IA64_REG_AR_ITC);return ret; } +#define get_cycles get_cyclesextern void ia64_cpu_local_tick (void );extern unsigned long long ia64_native_sched_clock (void );
arch/m68k/include/asm/timex.h +1 -1
@@ -35,7 +35,7 @@ static inline unsigned long random_get_entropy(void) {if (mach_random_get_entropy)return mach_random_get_entropy (); -return 0 ; +return random_get_entropy_fallback (); }#define random_get_entropy random_get_entropy
arch/mips/include/asm/timex.h +8 -9
@@ -76,25 +76,24 @@ static inline cycles_t get_cycles(void)else return 0 ;/* no usable counter */ } +#define get_cycles get_cycles/* * Like get_cycles - but where c0_count is not available we desperately * use c0_random in an attempt to get at least a little bit of entropy. -* -* R6000 and R6000A neither have a count register nor a random register. -* That leaves no entropy source in the CPU itself. */ static inline unsigned long random_get_entropy (void ) { -unsigned int prid =read_c0_prid (); -unsigned int imp = prid &PRID_IMP_MASK ; +unsigned int c0_random; -if (can_use_mips_counter (prid)) +if (can_use_mips_counter (read_c0_prid ()))return read_c0_count (); -else if (likely (imp !=PRID_IMP_R6000 && imp !=PRID_IMP_R6000A )) -return read_c0_random (); + +if (cpu_has_3kex) + c0_random = (read_c0_random () >>8 ) &0x3f ;else -return 0 ;/* no usable register */ + c0_random =read_c0_random () &0x3f ; +return (random_get_entropy_fallback () <<6 ) | (0x3f - c0_random); }#define random_get_entropy random_get_entropy
arch/nios2/include/asm/timex.h +3 -0
@@ -20,5 +20,8 @@typedef unsigned long cycles_t ;extern cycles_t get_cycles (void ); +#define get_cycles get_cycles + +#define random_get_entropy () (((unsigned long)get_cycles()) ?: random_get_entropy_fallback())#endif
arch/parisc/include/asm/timex.h +2 -1
@@ -12,9 +12,10 @@typedef unsigned long cycles_t ; -static inline cycles_t get_cycles (void ) +static inline cycles_t get_cycles (void ) {return mfctl (16 ); } +#define get_cycles get_cycles#endif
arch/powerpc/include/asm/archrandom.h +9 -18
@@ -6,27 +6,28 @@#include <asm/machdep.h> -static inline int arch_get_random_long (unsigned long *v) +static inline bool arch_get_random_long (unsigned long *v) { -return 0 ; +return false; } -static inline int arch_get_random_int (unsigned int *v) +static inline bool arch_get_random_int (unsigned int *v) { -return 0 ; +return false; } -static inline int arch_get_random_seed_long (unsigned long *v) +static inline bool arch_get_random_seed_long (unsigned long *v) {if (ppc_md.get_random_seed)return ppc_md.get_random_seed (v); -return 0 ; +return false; } -static inline int arch_get_random_seed_int (unsigned int *v) + +static inline bool arch_get_random_seed_int (unsigned int *v) {unsigned long val; -int rc; +bool rc; rc =arch_get_random_seed_long (&val);if (rc)
@@ -34,16 +35,6 @@ static inline int arch_get_random_seed_int(unsigned int *v) return rc; } - -static inline int arch_has_random (void ) -{ -return 0 ; -} - -static inline int arch_has_random_seed (void ) -{ -return !!ppc_md.get_random_seed; -}#endif /* CONFIG_ARCH_RANDOM */ #ifdef CONFIG_PPC_POWERNV
arch/powerpc/include/asm/timex.h +1 -0
@@ -50,6 +50,7 @@ static inline cycles_t get_cycles(void)return ret;#endif } +#define get_cycles get_cycles#endif /* __KERNEL__ */ #endif /* _ASM_POWERPC_TIMEX_H */
arch/s390/include/asm/archrandom.h +0 -12
@@ -26,18 +26,6 @@ static void s390_arch_random_generate(u8 *buf, unsigned int nbytes)atomic64_add (nbytes, &s390_arch_random_counter); } -static inline bool arch_has_random (void ) -{ -if (static_branch_likely (&s390_arch_random_available)) -return true; -return false; -} - -static inline bool arch_has_random_seed (void ) -{ -return arch_has_random (); -} -static inline bool arch_get_random_long (unsigned long *v) {if (static_branch_likely (&s390_arch_random_available)) {
arch/s390/include/asm/timex.h +1 -0
@@ -177,6 +177,7 @@ static inline cycles_t get_cycles(void) {return (cycles_t )get_tod_clock () >>2 ; } +#define get_cycles get_cyclesint get_phys_clock (unsigned long *clock);void init_cpu_timer (void );
arch/s390/mm/pgtable.c +1 -1
@@ -684,7 +684,7 @@ void ptep_zap_key(struct mm_struct *mm, unsigned long addr, pte_t *ptep)pgste_val (pgste) |=PGSTE_GR_BIT |PGSTE_GC_BIT ; ptev =pte_val (*ptep);if (!(ptev & _PAGE_INVALID) && (ptev & _PAGE_WRITE)) -page_set_storage_key (ptev &PAGE_MASK ,PAGE_DEFAULT_KEY ,1 ); +page_set_storage_key (ptev &PAGE_MASK ,PAGE_DEFAULT_KEY ,0 );pgste_set_unlock (ptep, pgste);preempt_enable (); }
arch/sparc/include/asm/timex_32.h +1 -3
@@ -9,8 +9,6 @@#define CLOCK_TICK_RATE 1193180/* Underlying HZ */ -/* XXX Maybe do something better at some point... -DaveM */ -typedef unsigned long cycles_t ; -#define get_cycles () (0) +#include <asm-generic/timex.h> #endif
arch/um/include/asm/timex.h +2 -7
@@ -2,13 +2,8 @@#ifndef __UM_TIMEX_H#define __UM_TIMEX_H -typedef unsigned long cycles_t ; - -static inline cycles_t get_cycles (void ) -{ -return 0 ; -} -#define CLOCK_TICK_RATE (HZ) +#include <asm-generic/timex.h> +#endif
arch/x86/include/asm/archrandom.h +4 -8
@@ -86,10 +86,6 @@ static inline bool rdseed_int(unsigned int *v)return ok; } -/* Conditional execution based on CPU type */ -#define arch_has_random () static_cpu_has(X86_FEATURE_RDRAND) -#define arch_has_random_seed () static_cpu_has(X86_FEATURE_RDSEED) -/* * These are the generic interfaces; they must not be declared if the * stubs in <linux/random.h> are to be invoked,
@@ -99,22 +95,22 @@ static inline bool rdseed_int(unsigned int *v)static inline bool arch_get_random_long (unsigned long *v) { -return arch_has_random () ?rdrand_long (v) : false; +return static_cpu_has (X86_FEATURE_RDRAND ) ?rdrand_long (v) : false; }static inline bool arch_get_random_int (unsigned int *v) { -return arch_has_random () ?rdrand_int (v) : false; +return static_cpu_has (X86_FEATURE_RDRAND ) ?rdrand_int (v) : false; }static inline bool arch_get_random_seed_long (unsigned long *v) { -return arch_has_random_seed () ?rdseed_long (v) : false; +return static_cpu_has (X86_FEATURE_RDSEED ) ?rdseed_long (v) : false; }static inline bool arch_get_random_seed_int (unsigned int *v) { -return arch_has_random_seed () ?rdseed_int (v) : false; +return static_cpu_has (X86_FEATURE_RDSEED ) ?rdseed_int (v) : false; }extern void x86_init_rdrand (struct cpuinfo_x86 *c);
arch/x86/include/asm/timex.h +9 -0
@@ -5,6 +5,15 @@#include <asm/processor.h> #include <asm/tsc.h> +static inline unsigned long random_get_entropy (void ) +{ +if (!IS_ENABLED (CONFIG_X86_TSC ) && + !cpu_feature_enabled (X86_FEATURE_TSC )) +return random_get_entropy_fallback (); +return rdtsc (); +} +#define random_get_entropy random_get_entropy +/* Assume we use the PIT time source for the clock tick */ #define CLOCK_TICK_RATE PIT_TICK_RATE
arch/x86/include/asm/tsc.h +3 -4
@@ -22,13 +22,12 @@ extern void disable_TSC(void);static inline cycles_t get_cycles (void ) { -#ifndef CONFIG_X86_TSC -if (!boot_cpu_has (X86_FEATURE_TSC )) +if (!IS_ENABLED (CONFIG_X86_TSC ) && + !cpu_feature_enabled (X86_FEATURE_TSC ))return 0 ; -#endif -return rdtsc (); } +#define get_cycles get_cyclesextern struct system_counterval_t convert_art_to_tsc (u64 art);
arch/xtensa/include/asm/timex.h +2 -4
@@ -30,10 +30,6 @@extern unsigned long ccount_freq; -typedef unsigned long long cycles_t ; - -#define get_cycles () (0) -void local_timer_setup (unsigned cpu);/*
@@ -69,4 +65,6 @@ static inline void set_linux_timer (unsigned long ccompare) WSR_CCOMPARE(LINUX_TIMER, ccompare); } +#include <asm-generic/timex.h> +#endif /* _XTENSA_TIMEX_H */
certs/blacklist_hashes.c +1 -1
@@ -1,7 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include "blacklist.h" -const char __initdata *const blacklist_hashes[] = { +const char __initconst *const blacklist_hashes[] = { #include CONFIG_SYSTEM_BLACKLIST_HASH_LIST ,NULL };
crypto/chacha20_generic.c +2 -1
@@ -22,7 +22,8 @@ static inline u32 le32_to_cpuvp(const void *p)static void chacha20_docrypt (u32 *state,u8 *dst,const u8 *src,unsigned int bytes) { -u8 stream[CHACHA20_BLOCK_SIZE ]; +/* aligned to potentially speed up crypto_xor() */ +u8 stream[CHACHA20_BLOCK_SIZE ]__aligned(sizeof(long)) ;if (dst != src)memcpy (dst, src, bytes);
crypto/drbg.c +149 -71
339 lines not on this page · raw message
crypto/md4.c +0 -17
@@ -64,23 +64,6 @@ static inline u32 H(u32 x, u32 y, u32 z)#define ROUND2 (a,b,c,d,k,s) (a = lshift(a + G(b,c,d) + k + (u32)0x5A827999,s))#define ROUND3 (a,b,c,d,k,s) (a = lshift(a + H(b,c,d) + k + (u32)0x6ED9EBA1,s)) -/* XXX: this stuff can be optimized */ -static inline void le32_to_cpu_array (u32 *buf,unsigned int words) -{ -while (words--) { -__le32_to_cpus (buf); - buf++; - } -} - -static inline void cpu_to_le32_array (u32 *buf,unsigned int words) -{ -while (words--) { -__cpu_to_le32s (buf); - buf++; - } -} -static void md4_transform (u32 *hash,u32 const *in) {u32 a, b, c, d;
crypto/md5.c +0 -17
@@ -32,23 +32,6 @@ const u8 md5_zero_message_hash[MD5_DIGEST_SIZE] = { };EXPORT_SYMBOL_GPL (md5_zero_message_hash); -/* XXX: this stuff can be optimized */ -static inline void le32_to_cpu_array (u32 *buf,unsigned int words) -{ -while (words--) { -__le32_to_cpus (buf); - buf++; - } -} - -static inline void cpu_to_le32_array (u32 *buf,unsigned int words) -{ -while (words--) { -__cpu_to_le32s (buf); - buf++; - } -} -#define F1 (x, y, z) (z ^ (x & (y ^ z)))#define F2 (x, y, z) F1(z, x, y)#define F3 (x, y, z) (x ^ y ^ z)
drivers/ata/libata-core.c +2 -2
@@ -6180,7 +6180,7 @@ struct ata_host *ata_host_alloc_pinfo(struct device *dev, const struct ata_port_info * const * ppi, int n_ports) { -const struct ata_port_info *pi; +const struct ata_port_info *pi = &ata_dummy_port_info;struct ata_host *host;int i, j;
@@ -6188,7 +6188,7 @@ struct ata_host *ata_host_alloc_pinfo(struct device *dev,if (!host)return NULL ; -for (i =0 , j =0 , pi =NULL ; i < host->n_ports; i++) { +for (i =0 , j =0 ; i < host->n_ports; i++) {struct ata_port *ap = host->ports[i];if (ppi[j])
drivers/char/Kconfig +37 -1
@@ -588,5 +588,41 @@ config TILE_SROM source "drivers/char/xillybus/Kconfig" -endmenu +config RANDOM_TRUST_CPU + bool "Initialize RNG using CPU RNG instructions" + default y + depends on ARCH_RANDOM + help + Initialize the RNG using random numbers supplied by the CPU's + RNG instructions (e.g. RDRAND), if supported and available. These + random numbers are never used directly, but are rather hashed into + the main input pool, and this happens regardless of whether or not + this option is enabled. Instead, this option controls whether the + they are credited and hence can initialize the RNG. Additionally, + other sources of randomness are always used, regardless of this + setting. Enabling this implies trusting that the CPU can supply high + quality and non-backdoored random numbers. + + Say Y here unless you have reason to mistrust your CPU or believe + its RNG facilities may be faulty. This may also be configured at + boot time with "random.trust_cpu=on/off". + +config RANDOM_TRUST_BOOTLOADER + bool "Initialize RNG using bootloader-supplied seed" + default y + help + Initialize the RNG using a seed supplied by the bootloader or boot + environment (e.g. EFI or a bootloader-generated device tree). This + seed is not used directly, but is rather hashed into the main input + pool, and this happens regardless of whether or not this option is + enabled. Instead, this option controls whether the seed is credited + and hence can initialize the RNG. Additionally, other sources of + randomness are always used, regardless of this setting. Enabling + this implies trusting that the bootloader can supply high quality and + non-backdoored seeds. + + Say Y here unless you have reason to mistrust your bootloader or + believe its RNG facilities may be faulty. This may also be configured + at boot time with "random.trust_bootloader=on/off". +endmenu
drivers/char/hw_random/core.c +1 -0
@@ -15,6 +15,7 @@#include <linux/err.h> #include <linux/fs.h> #include <linux/hw_random.h> +#include <linux/random.h> #include <linux/kernel.h> #include <linux/kthread.h> #include <linux/sched/signal.h>
drivers/char/random.c +1107 -1925
2,164 lines not on this page · raw message
drivers/net/ethernet/broadcom/bgmac-bcma.c +0 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +17 -8
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/mediatek/mtk_eth_soc.c +19 -2
Lines of this file are not shown. View the raw message.
drivers/staging/comedi/drivers/vmk80xx.c +1 -1
Lines of this file are not shown. View the raw message.
include/crypto/blake2s.h new file +102 -0
102 lines not on this page · raw message
include/crypto/internal/blake2s.h new file +19 -0
Lines of this file are not shown. View the raw message.
include/linux/random.h +60 -65
125 lines not on this page · raw message
include/trace/events/random.h deleted +0 -316
316 lines not on this page · raw message
lib/crypto/blake2s-generic.c new file +111 -0
111 lines not on this page · raw message
lib/crypto/blake2s-selftest.c new file +591 -0
591 lines not on this page · raw message
lib/crypto/blake2s.c new file +78 -0
78 lines not on this page · raw message
lib/sha1.c +14 -81
95 lines not on this page · raw message
net/l2tp/l2tp_ppp.c +26 -34
60 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.