diff options
| author | Vladimir Oltean <olteanv@gmail.com> | 2019-08-05 01:38:48 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-08-06 14:37:02 -0700 |
| commit | 93fa8587b25356382a39f1ca3a81d6c1b42ac731 (patch) | |
| tree | 69c0a85f3fd18fec875563b529f9db0bcc4b99d3 /net | |
| parent | f163fed2764e66511fb5c489bf87e532ad7606fb (diff) | |
| download | linux-0-day-93fa8587b25356382a39f1ca3a81d6c1b42ac731.tar.gz linux-0-day-93fa8587b25356382a39f1ca3a81d6c1b42ac731.tar.xz | |
net: dsa: sja1105: Fix memory leak on meta state machine error path
When RX timestamping is enabled and two link-local (non-meta) frames are
received in a row, this constitutes an error.
The tagger is always caching the last link-local frame, in an attempt to
merge it with the meta follow-up frame when that arrives. To recover
from the above error condition, the initial cached link-local frame is
dropped and the second frame in a row is cached (in expectance of the
second meta frame).
However, when dropping the initial link-local frame, its backing memory
was being leaked.
Fixes: f3097be21bf1 ("net: dsa: sja1105: Add a state machine for RX timestamping")
Signed-off-by: Vladimir Oltean <olteanv@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/dsa/tag_sja1105.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/dsa/tag_sja1105.c b/net/dsa/tag_sja1105.c index 8fa8dda8a15b6..47ee88163a9da 100644 --- a/net/dsa/tag_sja1105.c +++ b/net/dsa/tag_sja1105.c @@ -165,6 +165,7 @@ static struct sk_buff "Expected meta frame, is %12llx " "in the DSA master multicast filter?\n", SJA1105_META_DMAC); + kfree_skb(sp->data->stampable_skb); } /* Hold a reference to avoid dsa_switch_rcv |