blob: a7d7ab24278ffbb41280094a36fcb9f8bf437ce1 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
From 6b095510765e054c4ee641f115ab72798d97ac21 Mon Sep 17 00:00:00 2001
From: Henning Schild <henning.schild@siemens.com>
Date: Mon, 18 Sep 2017 18:02:11 +0200
Subject: [PATCH 26/32] ivshmem-net: set and check descriptor flags
We do not support the use of any flags. Make sure the remote does not
confuse us using flags.
Signed-off-by: Henning Schild <henning.schild@siemens.com>
[Jan: Remove wrong removal of next field initialization]
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
drivers/net/ivshmem-net.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/net/ivshmem-net.c b/drivers/net/ivshmem-net.c
index abc50553e644..9ecf1d0f0d2d 100644
--- a/drivers/net/ivshmem-net.c
+++ b/drivers/net/ivshmem-net.c
@@ -123,8 +123,12 @@ static void *ivshm_net_desc_data(struct ivshm_net *in,
{
u64 offs = READ_ONCE(desc->addr);
u32 dlen = READ_ONCE(desc->len);
+ u16 flags = READ_ONCE(desc->flags);
void *data;
+ if (flags)
+ return NULL;
+
if (offs >= in->shmlen)
return NULL;
@@ -317,6 +321,7 @@ static int ivshm_net_tx_frame(struct net_device *ndev, struct sk_buff *skb)
desc->addr = buf - in->shm;
desc->len = skb->len;
+ desc->flags = 0;
avail = tx->last_avail_idx++ & (vr->num - 1);
vr->avail->ring[avail] = desc_idx;
--
2.11.0
|
