[v1] net: remove an assert call in eth_get_gso_type

[PATCH] net: remove an assert call in eth_get_gso_type

P J P posted 1 patch 3 years, 6 months ago

Diff against v2 v3
Download mbox

Test checkpatch passed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20201020081119.1578251-1-ppandit@redhat.com

Maintainers: Jason Wang <jasowang@redhat.com>, Dmitry Fleytman <dmitry.fleytman@gmail.com>

There is a newer version of this series

net/eth.c | 3 ---
1 file changed, 3 deletions(-)

Expand all Fold all

[PATCH] net: remove an assert call in eth_get_gso_type

Posted by P J P 3 years, 6 months ago

From: Prasad J Pandit <pjp@fedoraproject.org>

eth_get_gso_type() routine returns segmentation offload type to use
based on L3 protocol type. It calls g_assert_not_reached if L3
protocol is unknown, making the following return statement unreachable.
Remove the g_assert call, as it maybe triggered by a guest user.

Reported-by: Gaoning Pan <pgn@zju.edu.cn>
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
---
 net/eth.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/net/eth.c b/net/eth.c
index 0c1d413ee2..f36a418077 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -72,9 +72,6 @@ eth_get_gso_type(uint16_t l3_proto, uint8_t *l3_hdr, uint8_t l4proto)
         }
     }
 
-    /* Unsupported offload */
-    g_assert_not_reached();
-
     return VIRTIO_NET_HDR_GSO_NONE | ecn_state;
 }
 
-- 
2.26.2

Re: [PATCH] net: remove an assert call in eth_get_gso_type

Posted by Philippe Mathieu-Daudé 3 years, 6 months ago

On 10/20/20 10:11 AM, P J P wrote:
> From: Prasad J Pandit <pjp@fedoraproject.org>
> 
> eth_get_gso_type() routine returns segmentation offload type to use
> based on L3 protocol type. It calls g_assert_not_reached if L3
> protocol is unknown, making the following return statement unreachable.
> Remove the g_assert call, as it maybe triggered by a guest user.
> 
> Reported-by: Gaoning Pan <pgn@zju.edu.cn>
> Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
> ---
>   net/eth.c | 3 ---
>   1 file changed, 3 deletions(-)
> 
> diff --git a/net/eth.c b/net/eth.c
> index 0c1d413ee2..f36a418077 100644
> --- a/net/eth.c
> +++ b/net/eth.c
> @@ -72,9 +72,6 @@ eth_get_gso_type(uint16_t l3_proto, uint8_t *l3_hdr, uint8_t l4proto)
>           }
>       }
>   
> -    /* Unsupported offload */
> -    g_assert_not_reached();

Maybe LOG_UNIMP with useful fields, so when user send bug
report we directly know what has to be implemented.

> -
>       return VIRTIO_NET_HDR_GSO_NONE | ecn_state;
>   }
>   
>

Re: [PATCH] net: remove an assert call in eth_get_gso_type

Posted by P J P 3 years, 6 months ago

+-- On Tue, 20 Oct 2020, Philippe Mathieu-Daudé wrote --+
| Maybe LOG_UNIMP with useful fields, so when user send bug report we directly 
| know what has to be implemented.

  qemu_log("Probably not GSO frame, unknown L3 protocol: %hd\n", l3_proto);

Maybe just qemu_log()? LOG_UNIMP seems mismatching.

Thank you.
--
Prasad J Pandit / Red Hat Product Security Team
8685 545E B54C 486B C6EB 271E E285 8B5A F050 DE8D