| Message ID | 20230717144640.23166-1-ruc_gongyuanjun@163.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [1/1] drivers:net: fix return value check in mlx5e_ipsec_remove_trailer | expand |
On 17/07/2023 17:46, Yuanjun Gong wrote: > mlx5e_ipsec_remove_trailer should return an error code if function > pskb_trim returns an unexpected value. > It's a fix, please add a Fixes tag. > Signed-off-by: Yuanjun Gong <ruc_gongyuanjun@163.com> > --- > drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c > index eab5bc718771..8d995e304869 100644 > --- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c > +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c > @@ -58,7 +58,9 @@ static int mlx5e_ipsec_remove_trailer(struct sk_buff *skb, struct xfrm_state *x) > > trailer_len = alen + plen + 2; > > - pskb_trim(skb, skb->len - trailer_len); > + ret = pskb_trim(skb, skb->len - trailer_len); > + if (unlikely(ret)) > + return ret; > if (skb->protocol == htons(ETH_P_IP)) { > ipv4hdr->tot_len = htons(ntohs(ipv4hdr->tot_len) - trailer_len); > ip_send_check(ipv4hdr); Other than that: Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
On Mon, Jul 17, 2023 at 10:46:40PM +0800, Yuanjun Gong wrote: > mlx5e_ipsec_remove_trailer should return an error code if function > pskb_trim returns an unexpected value. > > Signed-off-by: Yuanjun Gong <ruc_gongyuanjun@163.com> > --- > drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) Please add fixes line, change title to be "net/mlx5e: ...." instead of "drivers:..." and target tree which is "net". Thanks > > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c > index eab5bc718771..8d995e304869 100644 > --- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c > +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c > @@ -58,7 +58,9 @@ static int mlx5e_ipsec_remove_trailer(struct sk_buff *skb, struct xfrm_state *x) > > trailer_len = alen + plen + 2; > > - pskb_trim(skb, skb->len - trailer_len); > + ret = pskb_trim(skb, skb->len - trailer_len); > + if (unlikely(ret)) > + return ret; > if (skb->protocol == htons(ETH_P_IP)) { > ipv4hdr->tot_len = htons(ntohs(ipv4hdr->tot_len) - trailer_len); > ip_send_check(ipv4hdr); > -- > 2.17.1 >
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c index eab5bc718771..8d995e304869 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c @@ -58,7 +58,9 @@ static int mlx5e_ipsec_remove_trailer(struct sk_buff *skb, struct xfrm_state *x) trailer_len = alen + plen + 2; - pskb_trim(skb, skb->len - trailer_len); + ret = pskb_trim(skb, skb->len - trailer_len); + if (unlikely(ret)) + return ret; if (skb->protocol == htons(ETH_P_IP)) { ipv4hdr->tot_len = htons(ntohs(ipv4hdr->tot_len) - trailer_len); ip_send_check(ipv4hdr);
mlx5e_ipsec_remove_trailer should return an error code if function pskb_trim returns an unexpected value. Signed-off-by: Yuanjun Gong <ruc_gongyuanjun@163.com> --- drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)