Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (8be636dd) · Commits · 戴 / test

Pull networking fixes from David Miller: 1) Fix memory leak in xfrm_state code, from Steffen Klassert. 2) Fix races between devlink reload operations and device setup/cleanup, from Jiri Pirko. 3) Null deref in NFC code, from Stephan Gerhold. 4) Refcount fixes in SMC, from Ursula Braun. 5) Memory leak in slcan open error paths, from Jouni Hogander. 6) Fix ETS bandwidth validation in hns3, from Yonglong Liu. 7) Info leak on short USB request answers in ax88172a driver, from Oliver Neukum. 8) Release mem region properly in ep93xx_eth, from Chuhong Yuan. 9) PTP config timestamp flags validation, from Richard Cochran. 10) Dangling pointers after SKB data realloc in seg6, from Andrea Mayer. 11) Missing free_netdev() in gemini driver, from Chuhong Yuan. * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (56 commits) ipmr: Fix skb headroom in ipmr_get_route(). net: hns3: cleanup of stray struct hns3_link_mode_mapping net/smc: fix fastopen for non-blocking connect() rds: ib: update WR sizes when bringing up connection net: gemini: add missed free_netdev net: dsa: tag_8021q: Fix dsa_8021q_restore_pvid for an absent pvid seg6: fix skb transport_header after decap_and_validate() seg6: fix srh pointer in get_srh() net: stmmac: Use the correct style for SPDX License Identifier octeontx2-af: Use the correct style for SPDX License Identifier ptp: Extend the test program to check the external time stamp flags. mlx5: Reject requests to enable time stamping on both edges. igb: Reject requests that fail to enable time stamping on both edges. dp83640: Reject requests to enable time stamping on both edges. mv88e6xxx: Reject requests to enable time stamping on both edges. ptp: Introduce strict checking of external time stamp options. renesas: reject unsupported external timestamp flags mlx5: reject unsupported external timestamp flags igb: reject unsupported external timestamp flags dp83640: reject unsupported external timestamp flags ...

drivers/net/can/slcan.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -617,6 +617,7 @@ err_free_chan:
		sl->tty = NULL;
		tty->disc_data = NULL;
		clear_bit(SLF_INUSE, &sl->flags);
		free_netdev(sl->dev);

		err_exit:
		rtnl_unlock();

drivers/net/dsa/mv88e6xxx/ptp.c

+13 −0

Original line number	Diff line number	Diff line
		@@ -273,6 +273,19 @@ static int mv88e6352_ptp_enable_extts(struct mv88e6xxx_chip *chip,
		int pin;
		int err;

		/* Reject requests with unsupported flags */
		if (rq->extts.flags & ~(PTP_ENABLE_FEATURE \|
		PTP_RISING_EDGE \|
		PTP_FALLING_EDGE \|
		PTP_STRICT_FLAGS))
		return -EOPNOTSUPP;

		/* Reject requests to enable time stamping on both edges. */
		if ((rq->extts.flags & PTP_STRICT_FLAGS) &&
		(rq->extts.flags & PTP_ENABLE_FEATURE) &&
		(rq->extts.flags & PTP_EXTTS_EDGES) == PTP_EXTTS_EDGES)
		return -EOPNOTSUPP;

		pin = ptp_find_pin(chip->ptp_clock, PTP_PF_EXTTS, rq->extts.index);

		if (pin < 0)

drivers/net/ethernet/broadcom/tg3.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -6280,6 +6280,10 @@ static int tg3_ptp_enable(struct ptp_clock_info *ptp,

		switch (rq->type) {
		case PTP_CLK_REQ_PEROUT:
		/* Reject requests with unsupported flags */
		if (rq->perout.flags)
		return -EOPNOTSUPP;

		if (rq->perout.index != 0)
		return -EINVAL;

drivers/net/ethernet/cirrus/ep93xx_eth.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -763,6 +763,7 @@ static int ep93xx_eth_remove(struct platform_device *pdev)
		{
		struct net_device *dev;
		struct ep93xx_priv *ep;
		struct resource *mem;

		dev = platform_get_drvdata(pdev);
		if (dev == NULL)
		@@ -778,8 +779,8 @@ static int ep93xx_eth_remove(struct platform_device *pdev)
		iounmap(ep->base_addr);

		if (ep->res != NULL) {
		release_resource(ep->res);
		kfree(ep->res);
		mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
		release_mem_region(mem->start, resource_size(mem));
		}

		free_netdev(dev);

drivers/net/ethernet/cortina/gemini.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -2524,6 +2524,7 @@ static int gemini_ethernet_port_remove(struct platform_device *pdev)
		struct gemini_ethernet_port *port = platform_get_drvdata(pdev);

		gemini_port_remove(port);
		free_netdev(port->netdev);
		return 0;
		}

Admin message