Skip to content

Commit 3561373

Browse files
kuba-mookuba-moo
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Merge in late fixes to prepare for the 6.12 net-next PR. No conflicts or adjacent changes. Signed-off-by: Jakub Kicinski <[email protected]>
2 parents be46181 + 7052622 commit 3561373

File tree

13 files changed

+76
-35
lines changed

13 files changed

+76
-35
lines changed

‎drivers/net/bareudp.c‎

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ static int bareudp_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
6868
__be16 proto;
6969
void *oiph;
7070
int err;
71+
int nh;
7172

7273
bareudp = rcu_dereference_sk_user_data(sk);
7374
if (!bareudp)
@@ -148,10 +149,25 @@ static int bareudp_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
148149
}
149150
skb_dst_set(skb, &tun_dst->dst);
150151
skb->dev = bareudp->dev;
151-
oiph = skb_network_header(skb);
152-
skb_reset_network_header(skb);
153152
skb_reset_mac_header(skb);
154153

154+
/* Save offset of outer header relative to skb->head,
155+
* because we are going to reset the network header to the inner header
156+
* and might change skb->head.
157+
*/
158+
nh = skb_network_header(skb) - skb->head;
159+
160+
skb_reset_network_header(skb);
161+
162+
if (!pskb_inet_may_pull(skb)) {
163+
DEV_STATS_INC(bareudp->dev, rx_length_errors);
164+
DEV_STATS_INC(bareudp->dev, rx_errors);
165+
goto drop;
166+
}
167+
168+
/* Get the outer header. */
169+
oiph = skb->head + nh;
170+
155171
if (!ipv6_mod_enabled() || family == AF_INET)
156172
err = IP_ECN_decapsulate(oiph, skb);
157173
else
@@ -301,6 +317,9 @@ static int bareudp_xmit_skb(struct sk_buff *skb, struct net_device *dev,
301317
__be32 saddr;
302318
int err;
303319

320+
if (!skb_vlan_inet_prepare(skb, skb->protocol != htons(ETH_P_TEB)))
321+
return -EINVAL;
322+
304323
if (!sock)
305324
return -ESHUTDOWN;
306325

@@ -368,6 +387,9 @@ static int bareudp6_xmit_skb(struct sk_buff *skb, struct net_device *dev,
368387
__be16 sport;
369388
int err;
370389

390+
if (!skb_vlan_inet_prepare(skb, skb->protocol != htons(ETH_P_TEB)))
391+
return -EINVAL;
392+
371393
if (!sock)
372394
return -ESHUTDOWN;
373395

‎drivers/net/can/kvaser_pciefd.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1104,6 +1104,9 @@ static int kvaser_pciefd_setup_dma(struct kvaser_pciefd *pcie)
11041104

11051105
/* Disable the DMA */
11061106
iowrite32(0, KVASER_PCIEFD_SRB_ADDR(pcie) + KVASER_PCIEFD_SRB_CTRL_REG);
1107+
1108+
dma_set_mask_and_coherent(&pcie->pci->dev, DMA_BIT_MASK(64));
1109+
11071110
for (i = 0; i < KVASER_PCIEFD_DMA_COUNT; i++) {
11081111
pcie->dma_data[i] = dmam_alloc_coherent(&pcie->pci->dev,
11091112
KVASER_PCIEFD_DMA_SIZE,

‎drivers/net/can/m_can/m_can.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1764,11 +1764,7 @@ static int m_can_close(struct net_device *dev)
17641764

17651765
netif_stop_queue(dev);
17661766

1767-
if (!cdev->is_peripheral)
1768-
napi_disable(&cdev->napi);
1769-
17701767
m_can_stop(dev);
1771-
m_can_clk_stop(cdev);
17721768
free_irq(dev->irq, dev);
17731769

17741770
m_can_clean(dev);
@@ -1777,10 +1773,13 @@ static int m_can_close(struct net_device *dev)
17771773
destroy_workqueue(cdev->tx_wq);
17781774
cdev->tx_wq = NULL;
17791775
can_rx_offload_disable(&cdev->offload);
1776+
} else {
1777+
napi_disable(&cdev->napi);
17801778
}
17811779

17821780
close_candev(dev);
17831781

1782+
m_can_clk_stop(cdev);
17841783
phy_power_off(cdev->transceiver);
17851784

17861785
return 0;
@@ -2031,6 +2030,8 @@ static int m_can_open(struct net_device *dev)
20312030

20322031
if (cdev->is_peripheral)
20332032
can_rx_offload_enable(&cdev->offload);
2033+
else
2034+
napi_enable(&cdev->napi);
20342035

20352036
/* register interrupt handler */
20362037
if (cdev->is_peripheral) {
@@ -2064,9 +2065,6 @@ static int m_can_open(struct net_device *dev)
20642065
if (err)
20652066
goto exit_start_fail;
20662067

2067-
if (!cdev->is_peripheral)
2068-
napi_enable(&cdev->napi);
2069-
20702068
netif_start_queue(dev);
20712069

20722070
return 0;
@@ -2080,6 +2078,8 @@ static int m_can_open(struct net_device *dev)
20802078
out_wq_fail:
20812079
if (cdev->is_peripheral)
20822080
can_rx_offload_disable(&cdev->offload);
2081+
else
2082+
napi_disable(&cdev->napi);
20832083
close_candev(dev);
20842084
exit_disable_clks:
20852085
m_can_clk_stop(cdev);

‎drivers/net/can/usb/esd_usb.c‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* CAN driver for esd electronics gmbh CAN-USB/2, CAN-USB/3 and CAN-USB/Micro
44
*
55
* Copyright (C) 2010-2012 esd electronic system design gmbh, Matthias Fuchs <[email protected]>
6-
* Copyright (C) 2022-2023 esd electronics gmbh, Frank Jungclaus <[email protected]>
6+
* Copyright (C) 2022-2024 esd electronics gmbh, Frank Jungclaus <[email protected]>
77
*/
88

99
#include <linux/can.h>
@@ -1116,9 +1116,6 @@ static int esd_usb_3_set_bittiming(struct net_device *netdev)
11161116
if (priv->can.ctrlmode & CAN_CTRLMODE_LISTENONLY)
11171117
flags |= ESD_USB_3_BAUDRATE_FLAG_LOM;
11181118

1119-
if (priv->can.ctrlmode & CAN_CTRLMODE_3_SAMPLES)
1120-
flags |= ESD_USB_3_BAUDRATE_FLAG_TRS;
1121-
11221119
baud_x->nom.brp = cpu_to_le16(nom_bt->brp & (nom_btc->brp_max - 1));
11231120
baud_x->nom.sjw = cpu_to_le16(nom_bt->sjw & (nom_btc->sjw_max - 1));
11241121
baud_x->nom.tseg1 = cpu_to_le16((nom_bt->prop_seg + nom_bt->phase_seg1)
@@ -1219,7 +1216,6 @@ static int esd_usb_probe_one_net(struct usb_interface *intf, int index)
12191216
switch (le16_to_cpu(dev->udev->descriptor.idProduct)) {
12201217
case ESD_USB_CANUSB3_PRODUCT_ID:
12211218
priv->can.clock.freq = ESD_USB_3_CAN_CLOCK;
1222-
priv->can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES;
12231219
priv->can.ctrlmode_supported |= CAN_CTRLMODE_FD;
12241220
priv->can.bittiming_const = &esd_usb_3_nom_bittiming_const;
12251221
priv->can.data_bittiming_const = &esd_usb_3_data_bittiming_const;

‎drivers/net/ethernet/meta/fbnic/fbnic_txrx.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1061,14 +1061,14 @@ static int fbnic_alloc_napi_vector(struct fbnic_dev *fbd, struct fbnic_net *fbn,
10611061
nv->fbd = fbd;
10621062
nv->v_idx = v_idx;
10631063

1064-
/* Record IRQ to NAPI struct */
1065-
netif_napi_set_irq(&nv->napi,
1066-
pci_irq_vector(to_pci_dev(fbd->dev), nv->v_idx));
1067-
10681064
/* Tie napi to netdev */
10691065
list_add(&nv->napis, &fbn->napis);
10701066
netif_napi_add(fbn->netdev, &nv->napi, fbnic_poll);
10711067

1068+
/* Record IRQ to NAPI struct */
1069+
netif_napi_set_irq(&nv->napi,
1070+
pci_irq_vector(to_pci_dev(fbd->dev), nv->v_idx));
1071+
10721072
/* Tie nv back to PCIe dev */
10731073
nv->dev = fbd->dev;
10741074

‎drivers/net/ethernet/realtek/r8169_phy_config.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1060,6 +1060,7 @@ static void rtl8125a_2_hw_phy_config(struct rtl8169_private *tp,
10601060
phy_modify_paged(phydev, 0xa86, 0x15, 0x0001, 0x0000);
10611061
rtl8168g_enable_gphy_10m(phydev);
10621062

1063+
rtl8168g_disable_aldps(phydev);
10631064
rtl8125a_config_eee_phy(phydev);
10641065
}
10651066

@@ -1099,6 +1100,7 @@ static void rtl8125b_hw_phy_config(struct rtl8169_private *tp,
10991100
phy_modify_paged(phydev, 0xbf8, 0x12, 0xe000, 0xa000);
11001101

11011102
rtl8125_legacy_force_mode(phydev);
1103+
rtl8168g_disable_aldps(phydev);
11021104
rtl8125b_config_eee_phy(phydev);
11031105
}
11041106

‎drivers/net/netkit.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,15 @@ static struct netkit *netkit_priv(const struct net_device *dev)
6565

6666
static netdev_tx_t netkit_xmit(struct sk_buff *skb, struct net_device *dev)
6767
{
68+
struct bpf_net_context __bpf_net_ctx, *bpf_net_ctx;
6869
struct netkit *nk = netkit_priv(dev);
6970
enum netkit_action ret = READ_ONCE(nk->policy);
7071
netdev_tx_t ret_dev = NET_XMIT_SUCCESS;
7172
const struct bpf_mprog_entry *entry;
7273
struct net_device *peer;
7374
int len = skb->len;
7475

76+
bpf_net_ctx = bpf_net_ctx_set(&__bpf_net_ctx);
7577
rcu_read_lock();
7678
peer = rcu_dereference(nk->peer);
7779
if (unlikely(!peer || !(peer->flags & IFF_UP) ||
@@ -110,6 +112,7 @@ static netdev_tx_t netkit_xmit(struct sk_buff *skb, struct net_device *dev)
110112
break;
111113
}
112114
rcu_read_unlock();
115+
bpf_net_ctx_clear(bpf_net_ctx);
113116
return ret_dev;
114117
}
115118

‎net/can/bcm.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1471,8 +1471,10 @@ static void bcm_notify(struct bcm_sock *bo, unsigned long msg,
14711471
/* remove device reference, if this is our bound device */
14721472
if (bo->bound && bo->ifindex == dev->ifindex) {
14731473
#if IS_ENABLED(CONFIG_PROC_FS)
1474-
if (sock_net(sk)->can.bcmproc_dir && bo->bcm_proc_read)
1474+
if (sock_net(sk)->can.bcmproc_dir && bo->bcm_proc_read) {
14751475
remove_proc_entry(bo->procname, sock_net(sk)->can.bcmproc_dir);
1476+
bo->bcm_proc_read = NULL;
1477+
}
14761478
#endif
14771479
bo->bound = 0;
14781480
bo->ifindex = 0;

‎net/ipv6/route.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ static void rt6_uncached_list_flush_dev(struct net_device *dev)
174174
struct net_device *rt_dev = rt->dst.dev;
175175
bool handled = false;
176176

177-
if (rt_idev->dev == dev) {
177+
if (rt_idev && rt_idev->dev == dev) {
178178
rt->rt6i_idev = in6_dev_get(blackhole_netdev);
179179
in6_dev_put(rt_idev);
180180
handled = true;

‎net/ipv6/rpl_iptunnel.c‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -263,10 +263,8 @@ static int rpl_input(struct sk_buff *skb)
263263
rlwt = rpl_lwt_lwtunnel(orig_dst->lwtstate);
264264

265265
err = rpl_do_srh(skb, rlwt);
266-
if (unlikely(err)) {
267-
kfree_skb(skb);
268-
return err;
269-
}
266+
if (unlikely(err))
267+
goto drop;
270268

271269
local_bh_disable();
272270
dst = dst_cache_get(&rlwt->cache);
@@ -286,9 +284,13 @@ static int rpl_input(struct sk_buff *skb)
286284

287285
err = skb_cow_head(skb, LL_RESERVED_SPACE(dst->dev));
288286
if (unlikely(err))
289-
return err;
287+
goto drop;
290288

291289
return dst_input(skb);
290+
291+
drop:
292+
kfree_skb(skb);
293+
return err;
292294
}
293295

294296
static int nla_put_rpl_srh(struct sk_buff *skb, int attrtype,

0 commit comments

Comments
 (0)