Unverified Commit b982dab6 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!386 Backport CVEs and bugfixes 

Merge Pull Request from: @zhangjialin11 
 
Pull new CVEs:
CVE-2022-3707
CVE-2023-0394

net bugfixes from Zhengchao Shao
fs bugfixes from Baokun Li and Li Nan
mm bugfixes form Liu Shixin
 
 
Link:https://gitee.com/openeuler/kernel/pulls/386

 

Reviewed-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 6ff43716 47b72618

drivers/gpu/drm/i915/gvt/gtt.c

+13 −4
Original line number Diff line number Diff line
@@ -1192,10 +1192,8 @@ static int split_2MB_gtt_entry(struct intel_vgpu *vgpu, 
	for_each_shadow_entry(sub_spt, &sub_se, sub_index) {

		ret = intel_gvt_hypervisor_dma_map_guest_page(vgpu,

				start_gfn + sub_index, PAGE_SIZE, &dma_addr);

		if (ret) {

			ppgtt_invalidate_spt(spt);

			return ret;

		}

		if (ret)

			goto err;

		sub_se.val64 = se->val64;



		/* Copy the PAT field from PDE. */
@@ -1214,6 +1212,17 @@ static int split_2MB_gtt_entry(struct intel_vgpu *vgpu, 
	ops->set_pfn(se, sub_spt->shadow_page.mfn);

	ppgtt_set_shadow_entry(spt, se, index);

	return 0;

err:

	/* Cancel the existing addess mappings of DMA addr. */

	for_each_present_shadow_entry(sub_spt, &sub_se, sub_index) {

		gvt_vdbg_mm("invalidate 4K entry\n");

		ppgtt_invalidate_pte(sub_spt, &sub_se);

	}

	/* Release the new allocated spt. */

	trace_spt_change(sub_spt->vgpu->id, "release", sub_spt,

		sub_spt->guest_page.gfn, sub_spt->shadow_page.type);

	ppgtt_free_spt(sub_spt);

	return ret;

}



static int split_64KB_gtt_entry(struct intel_vgpu *vgpu,

drivers/net/macvlan.c

+1 −1
Original line number Diff line number Diff line
@@ -1176,7 +1176,7 @@ void macvlan_common_setup(struct net_device *dev) 
{

	ether_setup(dev);



	dev->min_mtu		= 0;

	/* ether_setup() has set dev->min_mtu to ETH_MIN_MTU. */

	dev->max_mtu		= ETH_MAX_MTU;

	dev->priv_flags	       &= ~IFF_TX_SKB_SHARING;

	netif_keep_dst(dev);

fs/ext4/inode.c

+2 −1
Original line number Diff line number Diff line
@@ -4217,7 +4217,8 @@ int ext4_truncate(struct inode *inode) 


	/* If we zero-out tail of the page, we have to create jinode for jbd2 */

	if (inode->i_size & (inode->i_sb->s_blocksize - 1)) {

		if (ext4_inode_attach_jinode(inode) < 0)

		err = ext4_inode_attach_jinode(inode);

		if (err)

			goto out_trace;

	}

fs/ext4/super.c

+1 −1
Original line number Diff line number Diff line
@@ -6370,7 +6370,7 @@ static int ext4_write_info(struct super_block *sb, int type) 
	handle_t *handle;



	/* Data block + inode block */

	handle = ext4_journal_start(d_inode(sb->s_root), EXT4_HT_QUOTA, 2);

	handle = ext4_journal_start_sb(sb, EXT4_HT_QUOTA, 2);

	if (IS_ERR(handle))

		return PTR_ERR(handle);

	ret = dquot_commit_info(sb, type);

fs/xfs/xfs_bmap_item.c

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ STATIC void 
xfs_bui_item_free(

	struct xfs_bui_log_item	*buip)

{

	kmem_free(buip->bui_item.li_lv_shadow);

	kmem_cache_free(xfs_bui_zone, buip);

}
@@ -199,6 +200,7 @@ xfs_bud_item_release( 
	struct xfs_bud_log_item	*budp = BUD_ITEM(lip);



	xfs_bui_release(budp->bud_buip);

	kmem_free(budp->bud_item.li_lv_shadow);

	kmem_cache_free(xfs_bud_zone, budp);

}