| Message ID | 1668525024-38409-3-git-send-email-zhangchangzhong@huawei.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | three fixes for nixge driver | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Clearly marked for net |
| netdev/fixes_present | success | Fixes tag present in non-next series |
| netdev/subject_prefix | success | Link |
| netdev/cover_letter | success | Series has a cover letter |
| netdev/patch_count | success | Link |
| netdev/header_inline | success | No static functions without inline keyword in header files |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/cc_maintainers | success | CCed 7 of 7 maintainers |
| netdev/build_clang | success | Errors and warnings before: 2 this patch: 2 |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Signed-off-by tag matches author and committer |
| netdev/check_selftest | success | No net selftest shell script |
| netdev/verify_fixes | success | Fixes tag looks correct |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 8 lines checked |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/source_inline | success | Was 0 now: 0 |
Zhang Changzhong <zhangchangzhong@huawei.com> : > The check on the number of available BDs is incorrect because BDs are > required not only for frags but also for skb. This may result in > overwriting BD that is still in use. > > Fixes: 492caffa8a1a ("net: ethernet: nixge: Add support for National Instruments XGE netdev") > Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com> > --- > drivers/net/ethernet/ni/nixge.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/ni/nixge.c b/drivers/net/ethernet/ni/nixge.c > index d8cd520..91b7ebc 100644 > --- a/drivers/net/ethernet/ni/nixge.c > +++ b/drivers/net/ethernet/ni/nixge.c > @@ -518,7 +518,7 @@ static netdev_tx_t nixge_start_xmit(struct sk_buff *skb, > cur_p = &priv->tx_bd_v[priv->tx_bd_tail]; > tx_skb = &priv->tx_skb[priv->tx_bd_tail]; > > - if (nixge_check_tx_bd_space(priv, num_frag)) { > + if (nixge_check_tx_bd_space(priv, num_frag + 1)) { > if (!netif_queue_stopped(ndev)) > netif_stop_queue(ndev); > return NETDEV_TX_OK; > -- Reviewed-by: Francois Romieu <romieu@fr.zoreil.com> It's fine as a minimal fix but something may be done in a future patch to avoid the confusing nixge_check_tx_bd_space(..., num_frag + 1) vs static int nixge_check_tx_bd_space(struct nixge_priv *priv, int num_frag) (use "slots" for the latter ?). Consider waiting for -stable people's opinion before rushing into it as it may make their life harder.
diff --git a/drivers/net/ethernet/ni/nixge.c b/drivers/net/ethernet/ni/nixge.c index d8cd520..91b7ebc 100644 --- a/drivers/net/ethernet/ni/nixge.c +++ b/drivers/net/ethernet/ni/nixge.c @@ -518,7 +518,7 @@ static netdev_tx_t nixge_start_xmit(struct sk_buff *skb, cur_p = &priv->tx_bd_v[priv->tx_bd_tail]; tx_skb = &priv->tx_skb[priv->tx_bd_tail]; - if (nixge_check_tx_bd_space(priv, num_frag)) { + if (nixge_check_tx_bd_space(priv, num_frag + 1)) { if (!netif_queue_stopped(ndev)) netif_stop_queue(ndev); return NETDEV_TX_OK;
The check on the number of available BDs is incorrect because BDs are required not only for frags but also for skb. This may result in overwriting BD that is still in use. Fixes: 492caffa8a1a ("net: ethernet: nixge: Add support for National Instruments XGE netdev") Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com> --- drivers/net/ethernet/ni/nixge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)