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

!2789 linux-4.19.y inclusion 

Merge Pull Request from: @LiuYongQiang0816 
 
4.19.294..4.19.296 
 
Link:https://gitee.com/openeuler/kernel/pulls/2789

 

Reviewed-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 48d03614 389055ab

drivers/acpi/acpica/psopcode.c

+1 −1
Original line number Diff line number Diff line
@@ -603,7 +603,7 @@ const struct acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES] = { 


/* 7E */ ACPI_OP("Timer", ARGP_TIMER_OP, ARGI_TIMER_OP, ACPI_TYPE_ANY,

			 AML_CLASS_EXECUTE, AML_TYPE_EXEC_0A_0T_1R,

			 AML_FLAGS_EXEC_0A_0T_1R),

			 AML_FLAGS_EXEC_0A_0T_1R | AML_NO_OPERAND_RESOLVE),



/* ACPI 5.0 opcodes */

drivers/md/raid1.c

+3 −0
Original line number Diff line number Diff line
@@ -1809,6 +1809,9 @@ static int raid1_remove_disk(struct mddev *mddev, struct md_rdev *rdev) 
	int number = rdev->raid_disk;

	struct raid1_info *p = conf->mirrors + number;



	if (unlikely(number >= conf->raid_disks))

		goto abort;



	if (rdev != p->rdev)

		p = conf->mirrors + conf->raid_disks + number;

drivers/net/team/team.c

+9 −1
Original line number Diff line number Diff line
@@ -2091,6 +2091,11 @@ static const struct ethtool_ops team_ethtool_ops = { 
static void team_setup_by_port(struct net_device *dev,

			       struct net_device *port_dev)

{

	struct team *team = netdev_priv(dev);



	if (port_dev->type == ARPHRD_ETHER)

		dev->header_ops	= team->header_ops_cache;

	else

		dev->header_ops	= port_dev->header_ops;

	dev->type = port_dev->type;

	dev->hard_header_len = port_dev->hard_header_len;
@@ -2137,8 +2142,11 @@ static int team_dev_type_check_change(struct net_device *dev, 


static void team_setup(struct net_device *dev)

{

	struct team *team = netdev_priv(dev);



	ether_setup(dev);

	dev->max_mtu = ETH_MAX_MTU;

	team->header_ops_cache = dev->header_ops;



	dev->netdev_ops = &team_netdev_ops;

	dev->ethtool_ops = &team_ethtool_ops;

drivers/scsi/scsi_transport_iscsi.c

+8 −0
Original line number Diff line number Diff line
@@ -2861,6 +2861,10 @@ iscsi_set_param(struct iscsi_transport *transport, struct iscsi_uevent *ev) 
	if (!conn || !session)

		return -EINVAL;



	/* data will be regarded as NULL-ended string, do length check */

	if (strlen(data) > ev->u.set_param.len)

		return -EINVAL;



	switch (ev->u.set_param.param) {

	case ISCSI_PARAM_SESS_RECOVERY_TMO:

		sscanf(data, "%d", &value);
@@ -3013,6 +3017,10 @@ iscsi_set_host_param(struct iscsi_transport *transport, 
		return -ENODEV;

	}



	/* see similar check in iscsi_if_set_param() */

	if (strlen(data) > ev->u.set_host_param.len)

		return -EINVAL;



	err = transport->set_host_param(shost, ev->u.set_host_param.param,

					data, ev->u.set_host_param.len);

	scsi_host_put(shost);

fs/autofs/waitq.c

+2 −1
Original line number Diff line number Diff line
@@ -35,8 +35,9 @@ void autofs_catatonic_mode(struct autofs_sb_info *sbi) 
		wq->status = -ENOENT; /* Magic is gone - report failure */

		kfree(wq->name.name);

		wq->name.name = NULL;

		wq->wait_ctr--;

		wake_up_interruptible(&wq->queue);

		if (!--wq->wait_ctr)

			kfree(wq);

		wq = nwq;

	}

	fput(sbi->pipe);	/* Close the pipe */