]> git.baikalelectronics.ru Git - kernel.git/commitdiff
tun: fix return value when the number of iovs exceeds MAX_SKB_FRAGS
authorYunjian Wang <wangyunjian@huawei.com>
Fri, 25 Dec 2020 02:52:16 +0000 (10:52 +0800)
committerJakub Kicinski <kuba@kernel.org>
Mon, 28 Dec 2020 21:34:36 +0000 (13:34 -0800)
Currently the tun_napi_alloc_frags() function returns -ENOMEM when the
number of iovs exceeds MAX_SKB_FRAGS + 1. However this is inappropriate,
we should use -EMSGSIZE instead of -ENOMEM.

The following distinctions are matters:
1. the caller need to drop the bad packet when -EMSGSIZE is returned,
   which means meeting a persistent failure.
2. the caller can try again when -ENOMEM is returned, which means
   meeting a transient failure.

Fixes: dbb28a8499aa ("tun: enable napi_gro_frags() for TUN/TAP driver")
Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
Acked-by: Willem de Bruijn <willemb@google.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Link: https://lore.kernel.org/r/1608864736-24332-1-git-send-email-wangyunjian@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/tun.c

index fbed05ae7b0f6e4f5b91213f8fdd4242385e5108..978ac0981d16017d648ebd04f7746fb498db3620 100644 (file)
@@ -1365,7 +1365,7 @@ static struct sk_buff *tun_napi_alloc_frags(struct tun_file *tfile,
        int i;
 
        if (it->nr_segs > MAX_SKB_FRAGS + 1)
-               return ERR_PTR(-ENOMEM);
+               return ERR_PTR(-EMSGSIZE);
 
        local_bh_disable();
        skb = napi_get_frags(&tfile->napi);