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

!633 Backport CVEs and bugfixes 

Merge Pull Request from: @zhangjialin11 
 
Pull new CVEs:
CVE-2023-1855
CVE-2023-2006
CVE-2023-30772
CVE-2023-1872

net bugfixes from Ziyang Xuan
mm cleanup from Ma Wupeng
timer bugfix from Yu Liao
xfs bugfixes from Guo Xuenan 
 
Link:https://gitee.com/openeuler/kernel/pulls/633

 

Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
parents 9895e9ad 21ac0106

drivers/hwmon/xgene-hwmon.c

+1 −0
Original line number Diff line number Diff line
@@ -768,6 +768,7 @@ static int xgene_hwmon_remove(struct platform_device *pdev) 
{

	struct xgene_hwmon_dev *ctx = platform_get_drvdata(pdev);



	cancel_work_sync(&ctx->workq);

	hwmon_device_unregister(ctx->hwmon_dev);

	kfifo_free(&ctx->async_msg_fifo);

	if (acpi_disabled)

drivers/net/bonding/bond_main.c

+17 −7
Original line number Diff line number Diff line
@@ -1689,6 +1689,20 @@ void bond_lower_state_changed(struct slave *slave) 
	netdev_lower_state_changed(slave->dev, &info);

}



/* The bonding driver uses ether_setup() to convert a master bond device

 * to ARPHRD_ETHER, that resets the target netdevice's flags so we always

 * have to restore the IFF_MASTER flag, and only restore IFF_SLAVE and IFF_UP

 * if they were set

 */

static void bond_ether_setup(struct net_device *bond_dev)

{

	unsigned int flags = bond_dev->flags & (IFF_SLAVE | IFF_UP);



	ether_setup(bond_dev);

	bond_dev->flags |= IFF_MASTER | flags;

	bond_dev->priv_flags &= ~IFF_TX_SKB_SHARING;

}



/* enslave device <slave> to bond device <master> */

int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,

		 struct netlink_ext_ack *extack)
@@ -1783,10 +1797,8 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev, 


			if (slave_dev->type != ARPHRD_ETHER)

				bond_setup_by_slave(bond_dev, slave_dev);

			else {

				ether_setup(bond_dev);

				bond_dev->priv_flags &= ~IFF_TX_SKB_SHARING;

			}

			else

				bond_ether_setup(bond_dev);



			call_netdevice_notifiers(NETDEV_POST_TYPE_CHANGE,

						 bond_dev);
@@ -2171,9 +2183,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev, 
			eth_hw_addr_random(bond_dev);

		if (bond_dev->type != ARPHRD_ETHER) {

			dev_close(bond_dev);

			ether_setup(bond_dev);

			bond_dev->flags |= IFF_MASTER;

			bond_dev->priv_flags &= ~IFF_TX_SKB_SHARING;

			bond_ether_setup(bond_dev);

		}

	}

drivers/power/supply/da9150-charger.c

+1 −0
Original line number Diff line number Diff line
@@ -662,6 +662,7 @@ static int da9150_charger_remove(struct platform_device *pdev) 


	if (!IS_ERR_OR_NULL(charger->usb_phy))

		usb_unregister_notifier(charger->usb_phy, &charger->otg_nb);

	cancel_work_sync(&charger->otg_work);



	power_supply_unregister(charger->battery);

	power_supply_unregister(charger->usb);

fs/xfs/libxfs/xfs_alloc_btree.c

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ xfs_allocbt_free_block( 
	xfs_agblock_t		bno;

	int			error;



	bno = xfs_daddr_to_agbno(cur->bc_mp, XFS_BUF_ADDR(bp));

	bno = xfs_daddr_to_agbno(cur->bc_mp, xfs_buf_daddr(bp));

	error = xfs_alloc_put_freelist(cur->bc_tp, agbp, NULL, bno, 1);

	if (error)

		return error;

fs/xfs/libxfs/xfs_attr.c

+2 −2
Original line number Diff line number Diff line
@@ -1313,7 +1313,7 @@ xfs_attr_fillstate(xfs_da_state_t *state) 
	ASSERT((path->active >= 0) && (path->active < XFS_DA_NODE_MAXDEPTH));

	for (blk = path->blk, level = 0; level < path->active; blk++, level++) {

		if (blk->bp) {

			blk->disk_blkno = XFS_BUF_ADDR(blk->bp);

			blk->disk_blkno = xfs_buf_daddr(blk->bp);

			blk->bp = NULL;

		} else {

			blk->disk_blkno = 0;
@@ -1328,7 +1328,7 @@ xfs_attr_fillstate(xfs_da_state_t *state) 
	ASSERT((path->active >= 0) && (path->active < XFS_DA_NODE_MAXDEPTH));

	for (blk = path->blk, level = 0; level < path->active; blk++, level++) {

		if (blk->bp) {

			blk->disk_blkno = XFS_BUF_ADDR(blk->bp);

			blk->disk_blkno = xfs_buf_daddr(blk->bp);

			blk->bp = NULL;

		} else {

			blk->disk_blkno = 0;