mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-03-22 07:27:12 +08:00
Merge tag 'net-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Pull networking fixes from Jakub Kicinski:
"Including fixes from bpf, netfilter and can.
Current release - regressions:
- bpf: synchronize dispatcher update with bpf_dispatcher_xdp_func
- rxrpc:
- fix security setting propagation
- fix null-deref in rxrpc_unuse_local()
- fix switched parameters in peer tracing
Current release - new code bugs:
- rxrpc:
- fix I/O thread startup getting skipped
- fix locking issues in rxrpc_put_peer_locked()
- fix I/O thread stop
- fix uninitialised variable in rxperf server
- fix the return value of rxrpc_new_incoming_call()
- microchip: vcap: fix initialization of value and mask
- nfp: fix unaligned io read of capabilities word
Previous releases - regressions:
- stop in-kernel socket users from corrupting socket's task_frag
- stream: purge sk_error_queue in sk_stream_kill_queues()
- openvswitch: fix flow lookup to use unmasked key
- dsa: mv88e6xxx: avoid reg_lock deadlock in mv88e6xxx_setup_port()
- devlink:
- hold region lock when flushing snapshots
- protect devlink dump by the instance lock
Previous releases - always broken:
- bpf:
- prevent leak of lsm program after failed attach
- resolve fext program type when checking map compatibility
- skbuff: account for tail adjustment during pull operations
- macsec: fix net device access prior to holding a lock
- bonding: switch back when high prio link up
- netfilter: flowtable: really fix NAT IPv6 offload
- enetc: avoid buffer leaks on xdp_do_redirect() failure
- unix: fix race in SOCK_SEQPACKET's unix_dgram_sendmsg()
- dsa: microchip: remove IRQF_TRIGGER_FALLING in
request_threaded_irq"
* tag 'net-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (64 commits)
net: fec: check the return value of build_skb()
net: simplify sk_page_frag
Treewide: Stop corrupting socket's task_frag
net: Introduce sk_use_task_frag in struct sock.
mctp: Remove device type check at unregister
net: dsa: microchip: remove IRQF_TRIGGER_FALLING in request_threaded_irq
can: kvaser_usb: hydra: help gcc-13 to figure out cmd_len
can: flexcan: avoid unbalanced pm_runtime_enable warning
Documentation: devlink: add missing toc entry for etas_es58x devlink doc
mctp: serial: Fix starting value for frame check sequence
nfp: fix unaligned io read of capabilities word
net: stream: purge sk_error_queue in sk_stream_kill_queues()
myri10ge: Fix an error handling path in myri10ge_probe()
net: microchip: vcap: Fix initialization of value and mask
rxrpc: Fix the return value of rxrpc_new_incoming_call()
rxrpc: rxperf: Fix uninitialised variable
rxrpc: Fix I/O thread stop
rxrpc: Fix switched parameters in peer tracing
rxrpc: Fix locking issues in rxrpc_put_peer_locked()
rxrpc: Fix I/O thread startup getting skipped
...
This commit is contained in:
@@ -3217,6 +3217,7 @@ static int
|
||||
hfcm_l1callback(struct dchannel *dch, u_int cmd)
|
||||
{
|
||||
struct hfc_multi *hc = dch->hw;
|
||||
struct sk_buff_head free_queue;
|
||||
u_long flags;
|
||||
|
||||
switch (cmd) {
|
||||
@@ -3245,6 +3246,7 @@ hfcm_l1callback(struct dchannel *dch, u_int cmd)
|
||||
l1_event(dch->l1, HW_POWERUP_IND);
|
||||
break;
|
||||
case HW_DEACT_REQ:
|
||||
__skb_queue_head_init(&free_queue);
|
||||
/* start deactivation */
|
||||
spin_lock_irqsave(&hc->lock, flags);
|
||||
if (hc->ctype == HFC_TYPE_E1) {
|
||||
@@ -3264,20 +3266,21 @@ hfcm_l1callback(struct dchannel *dch, u_int cmd)
|
||||
plxsd_checksync(hc, 0);
|
||||
}
|
||||
}
|
||||
skb_queue_purge(&dch->squeue);
|
||||
skb_queue_splice_init(&dch->squeue, &free_queue);
|
||||
if (dch->tx_skb) {
|
||||
dev_kfree_skb(dch->tx_skb);
|
||||
__skb_queue_tail(&free_queue, dch->tx_skb);
|
||||
dch->tx_skb = NULL;
|
||||
}
|
||||
dch->tx_idx = 0;
|
||||
if (dch->rx_skb) {
|
||||
dev_kfree_skb(dch->rx_skb);
|
||||
__skb_queue_tail(&free_queue, dch->rx_skb);
|
||||
dch->rx_skb = NULL;
|
||||
}
|
||||
test_and_clear_bit(FLG_TX_BUSY, &dch->Flags);
|
||||
if (test_and_clear_bit(FLG_BUSY_TIMER, &dch->Flags))
|
||||
del_timer(&dch->timer);
|
||||
spin_unlock_irqrestore(&hc->lock, flags);
|
||||
__skb_queue_purge(&free_queue);
|
||||
break;
|
||||
case HW_POWERUP_REQ:
|
||||
spin_lock_irqsave(&hc->lock, flags);
|
||||
@@ -3384,6 +3387,9 @@ handle_dmsg(struct mISDNchannel *ch, struct sk_buff *skb)
|
||||
case PH_DEACTIVATE_REQ:
|
||||
test_and_clear_bit(FLG_L2_ACTIVATED, &dch->Flags);
|
||||
if (dch->dev.D.protocol != ISDN_P_TE_S0) {
|
||||
struct sk_buff_head free_queue;
|
||||
|
||||
__skb_queue_head_init(&free_queue);
|
||||
spin_lock_irqsave(&hc->lock, flags);
|
||||
if (debug & DEBUG_HFCMULTI_MSG)
|
||||
printk(KERN_DEBUG
|
||||
@@ -3405,14 +3411,14 @@ handle_dmsg(struct mISDNchannel *ch, struct sk_buff *skb)
|
||||
/* deactivate */
|
||||
dch->state = 1;
|
||||
}
|
||||
skb_queue_purge(&dch->squeue);
|
||||
skb_queue_splice_init(&dch->squeue, &free_queue);
|
||||
if (dch->tx_skb) {
|
||||
dev_kfree_skb(dch->tx_skb);
|
||||
__skb_queue_tail(&free_queue, dch->tx_skb);
|
||||
dch->tx_skb = NULL;
|
||||
}
|
||||
dch->tx_idx = 0;
|
||||
if (dch->rx_skb) {
|
||||
dev_kfree_skb(dch->rx_skb);
|
||||
__skb_queue_tail(&free_queue, dch->rx_skb);
|
||||
dch->rx_skb = NULL;
|
||||
}
|
||||
test_and_clear_bit(FLG_TX_BUSY, &dch->Flags);
|
||||
@@ -3424,6 +3430,7 @@ handle_dmsg(struct mISDNchannel *ch, struct sk_buff *skb)
|
||||
#endif
|
||||
ret = 0;
|
||||
spin_unlock_irqrestore(&hc->lock, flags);
|
||||
__skb_queue_purge(&free_queue);
|
||||
} else
|
||||
ret = l1_event(dch->l1, hh->prim);
|
||||
break;
|
||||
|
||||
@@ -1617,16 +1617,19 @@ hfcpci_l2l1D(struct mISDNchannel *ch, struct sk_buff *skb)
|
||||
test_and_clear_bit(FLG_L2_ACTIVATED, &dch->Flags);
|
||||
spin_lock_irqsave(&hc->lock, flags);
|
||||
if (hc->hw.protocol == ISDN_P_NT_S0) {
|
||||
struct sk_buff_head free_queue;
|
||||
|
||||
__skb_queue_head_init(&free_queue);
|
||||
/* prepare deactivation */
|
||||
Write_hfc(hc, HFCPCI_STATES, 0x40);
|
||||
skb_queue_purge(&dch->squeue);
|
||||
skb_queue_splice_init(&dch->squeue, &free_queue);
|
||||
if (dch->tx_skb) {
|
||||
dev_kfree_skb(dch->tx_skb);
|
||||
__skb_queue_tail(&free_queue, dch->tx_skb);
|
||||
dch->tx_skb = NULL;
|
||||
}
|
||||
dch->tx_idx = 0;
|
||||
if (dch->rx_skb) {
|
||||
dev_kfree_skb(dch->rx_skb);
|
||||
__skb_queue_tail(&free_queue, dch->rx_skb);
|
||||
dch->rx_skb = NULL;
|
||||
}
|
||||
test_and_clear_bit(FLG_TX_BUSY, &dch->Flags);
|
||||
@@ -1639,10 +1642,12 @@ hfcpci_l2l1D(struct mISDNchannel *ch, struct sk_buff *skb)
|
||||
hc->hw.mst_m &= ~HFCPCI_MASTER;
|
||||
Write_hfc(hc, HFCPCI_MST_MODE, hc->hw.mst_m);
|
||||
ret = 0;
|
||||
spin_unlock_irqrestore(&hc->lock, flags);
|
||||
__skb_queue_purge(&free_queue);
|
||||
} else {
|
||||
ret = l1_event(dch->l1, hh->prim);
|
||||
spin_unlock_irqrestore(&hc->lock, flags);
|
||||
}
|
||||
spin_unlock_irqrestore(&hc->lock, flags);
|
||||
break;
|
||||
}
|
||||
if (!ret)
|
||||
|
||||
@@ -326,20 +326,24 @@ hfcusb_l2l1D(struct mISDNchannel *ch, struct sk_buff *skb)
|
||||
test_and_clear_bit(FLG_L2_ACTIVATED, &dch->Flags);
|
||||
|
||||
if (hw->protocol == ISDN_P_NT_S0) {
|
||||
struct sk_buff_head free_queue;
|
||||
|
||||
__skb_queue_head_init(&free_queue);
|
||||
hfcsusb_ph_command(hw, HFC_L1_DEACTIVATE_NT);
|
||||
spin_lock_irqsave(&hw->lock, flags);
|
||||
skb_queue_purge(&dch->squeue);
|
||||
skb_queue_splice_init(&dch->squeue, &free_queue);
|
||||
if (dch->tx_skb) {
|
||||
dev_kfree_skb(dch->tx_skb);
|
||||
__skb_queue_tail(&free_queue, dch->tx_skb);
|
||||
dch->tx_skb = NULL;
|
||||
}
|
||||
dch->tx_idx = 0;
|
||||
if (dch->rx_skb) {
|
||||
dev_kfree_skb(dch->rx_skb);
|
||||
__skb_queue_tail(&free_queue, dch->rx_skb);
|
||||
dch->rx_skb = NULL;
|
||||
}
|
||||
test_and_clear_bit(FLG_TX_BUSY, &dch->Flags);
|
||||
spin_unlock_irqrestore(&hw->lock, flags);
|
||||
__skb_queue_purge(&free_queue);
|
||||
#ifdef FIXME
|
||||
if (test_and_clear_bit(FLG_L1_BUSY, &dch->Flags))
|
||||
dchannel_sched_event(&hc->dch, D_CLEARBUSY);
|
||||
@@ -1330,7 +1334,7 @@ tx_iso_complete(struct urb *urb)
|
||||
printk("\n");
|
||||
}
|
||||
|
||||
dev_kfree_skb(tx_skb);
|
||||
dev_consume_skb_irq(tx_skb);
|
||||
tx_skb = NULL;
|
||||
if (fifo->dch && get_next_dframe(fifo->dch))
|
||||
tx_skb = fifo->dch->tx_skb;
|
||||
|
||||
Reference in New Issue
Block a user