diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-11-03 11:38:42 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-11-03 13:21:54 -0700 |
| commit | fbeb229a6622523c092a13c02bd0e15f69240dde (patch) | |
| tree | a48bf5ff455cedae6555ef071e0d8bdb29487824 /drivers/net/tun.c | |
| parent | d9095f92950bd16745b9ec24ebebc12d14b3a3e8 (diff) | |
| parent | 9521c9d6a53df9c44a5f5ddbc229ceaf3cf79ef6 (diff) | |
| download | linux-fbeb229a6622523c092a13c02bd0e15f69240dde.tar.gz linux-fbeb229a6622523c092a13c02bd0e15f69240dde.tar.bz2 linux-fbeb229a6622523c092a13c02bd0e15f69240dde.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/tun.c')
| -rw-r--r-- | drivers/net/tun.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 48bb4a166ad4..0718e39117a8 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1459,7 +1459,8 @@ static struct sk_buff *tun_napi_alloc_frags(struct tun_file *tfile, int err; int i; - if (it->nr_segs > MAX_SKB_FRAGS + 1) + if (it->nr_segs > MAX_SKB_FRAGS + 1 || + len > (ETH_MAX_MTU - NET_SKB_PAD - NET_IP_ALIGN)) return ERR_PTR(-EMSGSIZE); local_bh_disable(); |