| Message ID | 97c78d21-7f0b-d843-df17-3589f224d2cf@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: warn if gso_type isn't set for a GSO SKB | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/subject_prefix | success | Link |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 10 this patch: 10 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 11 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 10 this patch: 10 |
| netdev/header_inline | success | Link |
| netdev/stable | success | Stable not CCed |
On Sat, 21 Nov 2020 00:22:20 +0100 Heiner Kallweit wrote: > In bug report [0] a warning in r8169 driver was reported that was > caused by an invalid GSO SKB (gso_type was 0). See [1] for a discussion > about this issue. Still the origin of the invalid GSO SKB isn't clear. > > It shouldn't be a network drivers task to check for invalid GSO SKB's. > Also, even if issue [0] can be fixed, we can't be sure that a > similar issue doesn't pop up again at another place. > Therefore let gso_features_check() check for such invalid GSO SKB's. > > [0] https://bugzilla.kernel.org/show_bug.cgi?id=209423 > [1] https://www.spinics.net/lists/netdev/msg690794.html > > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Applied, thanks!
diff --git a/net/core/dev.c b/net/core/dev.c index 4bfdcd6b2..3c3070d9d 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3495,6 +3495,11 @@ static netdev_features_t gso_features_check(const struct sk_buff *skb, if (gso_segs > dev->gso_max_segs) return features & ~NETIF_F_GSO_MASK; + if (!skb_shinfo(skb)->gso_type) { + skb_warn_bad_offload(skb); + return features & ~NETIF_F_GSO_MASK; + } + /* Support for GSO partial features requires software * intervention before we can actually process the packets * so we need to strip support for any partial features now
In bug report [0] a warning in r8169 driver was reported that was caused by an invalid GSO SKB (gso_type was 0). See [1] for a discussion about this issue. Still the origin of the invalid GSO SKB isn't clear. It shouldn't be a network drivers task to check for invalid GSO SKB's. Also, even if issue [0] can be fixed, we can't be sure that a similar issue doesn't pop up again at another place. Therefore let gso_features_check() check for such invalid GSO SKB's. [0] https://bugzilla.kernel.org/show_bug.cgi?id=209423 [1] https://www.spinics.net/lists/netdev/msg690794.html Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> --- net/core/dev.c | 5 +++++ 1 file changed, 5 insertions(+)