Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f413d0e authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.4.57 into android11-5.4 



Changes in 5.4.57
	random32: update the net random state on interrupt and activity
	ARM: percpu.h: fix build error
	random: fix circular include dependency on arm64 after addition of percpu.h
	random32: remove net_rand_state from the latent entropy gcc plugin
	random32: move the pseudo-random 32-bit definitions to prandom.h
	arm64: Workaround circular dependency in pointer_auth.h
	ext4: fix direct I/O read error
	selftests: bpf: Fix detach from sockmap tests
	bpf: sockmap: Require attach_bpf_fd when detaching a program
	Linux 5.4.57

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I3f51a779843eb1bc50ac6dc7fd9c3db66b2aea7f
parents 221bf836 d9939285

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 56

SUBLEVEL = 57

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/arm/include/asm/percpu.h

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 
#ifndef _ASM_ARM_PERCPU_H_

#define _ASM_ARM_PERCPU_H_



#include <asm/thread_info.h>



/*

 * Same as asm-generic/percpu.h, except that we store the per cpu offset

 * in the TPIDRPRW. TPIDRPRW only exists on V6K and V7

arch/arm64/include/asm/pointer_auth.h

+7 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
#define __ASM_POINTER_AUTH_H



#include <linux/bitops.h>

#include <linux/random.h>



#include <asm/cpufeature.h>

#include <asm/memory.h>
@@ -30,6 +29,13 @@ struct ptrauth_keys { 
	struct ptrauth_key apga;

};



/*

 * Only include random.h once ptrauth_keys_* structures are defined

 * to avoid yet another circular include hell (random.h * ends up

 * including asm/smp.h, which requires ptrauth_keys_kernel).

 */

#include <linux/random.h>



static inline void ptrauth_keys_init(struct ptrauth_keys *keys)

{

	if (system_supports_address_auth()) {

drivers/char/random.c

+1 −0
Original line number Diff line number Diff line
@@ -1249,6 +1249,7 @@ void add_interrupt_randomness(int irq, int irq_flags) 


	fast_mix(fast_pool);

	add_interrupt_bench(cycles);

	this_cpu_add(net_rand_state.s1, fast_pool->pool[cycles & 3]);



	if (unlikely(crng_init == 0)) {

		if ((fast_pool->count >= 64) &&

fs/ext4/inode.c

+5 −0
Original line number Diff line number Diff line
@@ -3860,6 +3860,11 @@ static ssize_t ext4_direct_IO_read(struct kiocb *iocb, struct iov_iter *iter) 
	struct inode *inode = mapping->host;

	size_t count = iov_iter_count(iter);

	ssize_t ret;

	loff_t offset = iocb->ki_pos;

	loff_t size = i_size_read(inode);



	if (offset >= size)

		return 0;



	/*

	 * Shared inode_lock is enough for us - it protects against concurrent