mirror of
https://github.com/torvalds/linux.git
synced 2024-11-17 17:41:44 +00:00
9bbe60a67b
ATM accounts for in-flight TX packets in sk_wmem_alloc of the VCC on which they are to be sent. But it doesn't take ownership of those packets from the sock (if any) which originally owned them. They should remain owned by their actual sender until they've left the box. There's a hack in pskb_expand_head() to avoid adjusting skb->truesize for certain skbs, precisely to avoid messing up sk_wmem_alloc accounting. Ideally that hack would cover the ATM use case too, but it doesn't — skbs which aren't owned by any sock, for example PPP control frames, still get their truesize adjusted when the low-level ATM driver adds headroom. This has always been an issue, it seems. The truesize of a packet increases, and sk_wmem_alloc on the VCC goes negative. But this wasn't for normal traffic, only for control frames. So I think we just got away with it, and we probably needed to send 2GiB of LCP echo frames before the misaccounting would ever have caused a problem and caused atm_may_send() to start refusing packets. Commit14afee4b60("net: convert sock.sk_wmem_alloc from atomic_t to refcount_t") did exactly what it was intended to do, and turned this mostly-theoretical problem into a real one, causing PPPoATM to fail immediately as sk_wmem_alloc underflows and atm_may_send() *immediately* starts refusing to allow new packets. The least intrusive solution to this problem is to stash the value of skb->truesize that was accounted to the VCC, in a new member of the ATM_SKB(skb) structure. Then in atm_pop_raw() subtract precisely that value instead of the then-current value of skb->truesize. Fixes:158f323b98("net: adjust skb->truesize in pskb_expand_head()") Signed-off-by: David Woodhouse <dwmw2@infradead.org> Tested-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
87 lines
1.9 KiB
C
87 lines
1.9 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/* net/atm/raw.c - Raw AAL0 and AAL5 transports */
|
|
|
|
/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
|
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/atmdev.h>
|
|
#include <linux/capability.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/skbuff.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/slab.h>
|
|
|
|
#include "common.h"
|
|
#include "protocols.h"
|
|
|
|
/*
|
|
* SKB == NULL indicates that the link is being closed
|
|
*/
|
|
|
|
static void atm_push_raw(struct atm_vcc *vcc, struct sk_buff *skb)
|
|
{
|
|
if (skb) {
|
|
struct sock *sk = sk_atm(vcc);
|
|
|
|
skb_queue_tail(&sk->sk_receive_queue, skb);
|
|
sk->sk_data_ready(sk);
|
|
}
|
|
}
|
|
|
|
static void atm_pop_raw(struct atm_vcc *vcc, struct sk_buff *skb)
|
|
{
|
|
struct sock *sk = sk_atm(vcc);
|
|
|
|
pr_debug("(%d) %d -= %d\n",
|
|
vcc->vci, sk_wmem_alloc_get(sk), ATM_SKB(skb)->acct_truesize);
|
|
WARN_ON(refcount_sub_and_test(ATM_SKB(skb)->acct_truesize, &sk->sk_wmem_alloc));
|
|
dev_kfree_skb_any(skb);
|
|
sk->sk_write_space(sk);
|
|
}
|
|
|
|
static int atm_send_aal0(struct atm_vcc *vcc, struct sk_buff *skb)
|
|
{
|
|
/*
|
|
* Note that if vpi/vci are _ANY or _UNSPEC the below will
|
|
* still work
|
|
*/
|
|
if (!capable(CAP_NET_ADMIN) &&
|
|
(((u32 *)skb->data)[0] & (ATM_HDR_VPI_MASK | ATM_HDR_VCI_MASK)) !=
|
|
((vcc->vpi << ATM_HDR_VPI_SHIFT) |
|
|
(vcc->vci << ATM_HDR_VCI_SHIFT))) {
|
|
kfree_skb(skb);
|
|
return -EADDRNOTAVAIL;
|
|
}
|
|
return vcc->dev->ops->send(vcc, skb);
|
|
}
|
|
|
|
int atm_init_aal0(struct atm_vcc *vcc)
|
|
{
|
|
vcc->push = atm_push_raw;
|
|
vcc->pop = atm_pop_raw;
|
|
vcc->push_oam = NULL;
|
|
vcc->send = atm_send_aal0;
|
|
return 0;
|
|
}
|
|
|
|
int atm_init_aal34(struct atm_vcc *vcc)
|
|
{
|
|
vcc->push = atm_push_raw;
|
|
vcc->pop = atm_pop_raw;
|
|
vcc->push_oam = NULL;
|
|
vcc->send = vcc->dev->ops->send;
|
|
return 0;
|
|
}
|
|
|
|
int atm_init_aal5(struct atm_vcc *vcc)
|
|
{
|
|
vcc->push = atm_push_raw;
|
|
vcc->pop = atm_pop_raw;
|
|
vcc->push_oam = NULL;
|
|
vcc->send = vcc->dev->ops->send;
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL(atm_init_aal5);
|