Unverified Commit d707b08b authored Feb 01, 2024 by openeuler-ci-bot Committed by Gitee Feb 01, 2024

!4392 linux-4.19.y inclusion

Merge Pull Request from: @LiuYongQiang0816 
 
linux-4.19.303..linux-4.19.305 
 
Link:https://gitee.com/openeuler/kernel/pulls/4392

 

Reviewed-by: Zhang Changzhong <zhangchangzhong@huawei.com>
Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>

parents 4bcac70a 015307ab

arch/x86/kernel/alternative.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -722,8 +722,8 @@ void __init_or_module text_poke_early(void addr, const void *opcode,
		} else {
		local_irq_save(flags);
		memcpy(addr, opcode, len);
		local_irq_restore(flags);
		sync_core();
		local_irq_restore(flags);

		/*
		* Could also do a CLFLUSH here to speed up CPU recovery; but

mm/memory.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2891,8 +2891,8 @@ void unmap_mapping_pages(struct address_space *mapping, pgoff_t start,
		void unmap_mapping_range(struct address_space *mapping,
		loff_t const holebegin, loff_t const holelen, int even_cows)
		{
		pgoff_t hba = holebegin >> PAGE_SHIFT;
		pgoff_t hlen = (holelen + PAGE_SIZE - 1) >> PAGE_SHIFT;
		pgoff_t hba = (pgoff_t)(holebegin) >> PAGE_SHIFT;
		pgoff_t hlen = ((pgoff_t)(holelen) + PAGE_SIZE - 1) >> PAGE_SHIFT;

		/* Check for overflow. */
		if (sizeof(holelen) > sizeof(hlen)) {

net/core/dev.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -3196,6 +3196,14 @@ static netdev_features_t gso_features_check(const struct sk_buff *skb,
		if (gso_segs > dev->gso_max_segs)
		return features & ~NETIF_F_GSO_MASK;

		if (unlikely(skb->len >= READ_ONCE(dev->gso_max_size)))
		return features & ~NETIF_F_GSO_MASK;

		if (!skb_shinfo(skb)->gso_type) {
		skb_warn_bad_offload(skb);
		return features & ~NETIF_F_GSO_MASK;
		}

		/* Support for GSO partial features requires software
		* intervention before we can actually process the packets
		* so we need to strip support for any partial features now