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

!563 Backport CVEs and bugfixes 

Merge Pull Request from: @zhangjialin11 
 
Pull new CVEs:
CVE-2023-1513
CVE-2022-4269

net bugfixes from Zhengchao Shao
ext4 bugfixes from Zhihao Cheng and Baokun Li
mm bugfix from Ma Wupeng
timer bugfix from Yu Liao
nvme bugfix from Li Lingfeng
xfs bugfixes from Zhihao Cheng
scsi bugfix from Yu Kuai 
 
Link:https://gitee.com/openeuler/kernel/pulls/563

 

Reviewed-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 3e4b12e0 c5eeec3b

arch/x86/kvm/x86.c

+1 −2
Original line number Diff line number Diff line
@@ -4692,12 +4692,11 @@ static void kvm_vcpu_ioctl_x86_get_debugregs(struct kvm_vcpu *vcpu, 
{

	unsigned long val;



	memset(dbgregs, 0, sizeof(*dbgregs));

	memcpy(dbgregs->db, vcpu->arch.db, sizeof(vcpu->arch.db));

	kvm_get_dr(vcpu, 6, &val);

	dbgregs->dr6 = val;

	dbgregs->dr7 = vcpu->arch.dr7;

	dbgregs->flags = 0;

	memset(&dbgregs->reserved, 0, sizeof(dbgregs->reserved));

}



static int kvm_vcpu_ioctl_x86_set_debugregs(struct kvm_vcpu *vcpu,

drivers/clocksource/arm_arch_timer.c

+2 −2
Original line number Diff line number Diff line
@@ -41,8 +41,8 @@ 
#define CNTACR_RWVT	BIT(4)

#define CNTACR_RWPT	BIT(5)



#define CNTVCT_LO	0x00

#define CNTPCT_LO	0x08

#define CNTPCT_LO	0x00

#define CNTVCT_LO	0x08

#define CNTFRQ		0x10

#define CNTP_CVAL_LO	0x20

#define CNTP_CTL	0x2c

drivers/nvme/host/trace.h

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ TRACE_EVENT(nvme_complete_rq, 
	    TP_fast_assign(

		__entry->ctrl_id = nvme_req(req)->ctrl->instance;

		__entry->qid = nvme_req_qid(req);

		__entry->cid = nvme_req(req)->cmd->common.command_id;

		__entry->cid = nvme_cid(req);

		__entry->result = le64_to_cpu(nvme_req(req)->result.u64);

		__entry->retries = nvme_req(req)->retries;

		__entry->flags = nvme_req(req)->flags;

drivers/scsi/device_handler/scsi_dh_alua.c

+4 −2
Original line number Diff line number Diff line
@@ -1036,10 +1036,12 @@ static int alua_activate(struct scsi_device *sdev, 
	rcu_read_unlock();

	mutex_unlock(&h->init_mutex);



	if (alua_rtpg_queue(pg, sdev, qdata, true))

	if (alua_rtpg_queue(pg, sdev, qdata, true)) {

		fn = NULL;

	else

	} else {

		kfree(qdata);

		err = SCSI_DH_DEV_OFFLINED;

	}

	kref_put(&pg->kref, release_port_group);

out:

	if (fn)

fs/ext4/ext4.h

+2 −1
Original line number Diff line number Diff line
@@ -1618,7 +1618,8 @@ struct ext4_sb_info { 


	/*

	 * Barrier between writepages ops and changing any inode's JOURNAL_DATA

	 * or EXTENTS flag.

	 * or EXTENTS flag or between writepages ops and changing DELALLOC or

	 * DIOREAD_NOLOCK mount options on remount.

	 */

	struct percpu_rw_semaphore s_writepages_rwsem;

	struct dax_device *s_daxdev;