net/ice: fix illegal pointer access in releasing vsi

Message ID 20210401151407.18546-1-wenwux.ma@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Qi Zhang
Headers
Series net/ice: fix illegal pointer access in releasing vsi |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK
ci/intel-Testing success Testing PASS
ci/travis-robot success travis build: passed
ci/github-robot success github build: passed

Commit Message

Ma, WenwuX April 1, 2021, 3:14 p.m. UTC
  When deleting the mac filter in ice_remove_all_mac_vlan_filters(),
TAILQ_FOREACH_SAFE should be used instead of TAILQ_FOREACH,
Otherwise, it will result in a illegal pointer access.

Signed-off-by: Wenwu Ma <wenwux.ma@intel.com>
---
 drivers/net/ice/ice_ethdev.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
  

Comments

Qi Zhang April 1, 2021, 12:02 p.m. UTC | #1
> -----Original Message-----
> From: Ma, WenwuX <wenwux.ma@intel.com>
> Sent: Thursday, April 1, 2021 11:14 PM
> To: Yang, Qiming <qiming.yang@intel.com>; Zhang, Qi Z
> <qi.z.zhang@intel.com>
> Cc: dev@dpdk.org
> Subject: [PATCH] net/ice: fix illegal pointer access in releasing vsi

Please add fix line and cc stable.

> 
> When deleting the mac filter in ice_remove_all_mac_vlan_filters(),
> TAILQ_FOREACH_SAFE should be used instead of TAILQ_FOREACH, Otherwise,
> it will result in a illegal pointer access.
> 
> Signed-off-by: Wenwu Ma <wenwux.ma@intel.com>
> ---
>  drivers/net/ice/ice_ethdev.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index
> 9c9b84a93..785750d9b 100644
> --- a/drivers/net/ice/ice_ethdev.c
> +++ b/drivers/net/ice/ice_ethdev.c
> @@ -10,6 +10,8 @@
>  #include <sys/stat.h>
>  #include <unistd.h>
> 
> +#include <rte_tailq.h>
> +
>  #include "base/ice_sched.h"
>  #include "base/ice_flow.h"
>  #include "base/ice_dcb.h"
> @@ -1094,12 +1096,13 @@ ice_remove_all_mac_vlan_filters(struct ice_vsi
> *vsi)  {
>  	struct ice_mac_filter *m_f;
>  	struct ice_vlan_filter *v_f;
> +	void *temp;
>  	int ret = 0;
> 
>  	if (!vsi || !vsi->mac_num)
>  		return -EINVAL;
> 
> -	TAILQ_FOREACH(m_f, &vsi->mac_list, next) {
> +	TAILQ_FOREACH_SAFE(m_f, &vsi->mac_list, next, temp) {
>  		ret = ice_remove_mac_filter(vsi, &m_f->mac_info.mac_addr);
>  		if (ret != ICE_SUCCESS) {
>  			ret = -EINVAL;
> @@ -1110,7 +1113,7 @@ ice_remove_all_mac_vlan_filters(struct ice_vsi *vsi)
>  	if (vsi->vlan_num == 0)
>  		return 0;
> 
> -	TAILQ_FOREACH(v_f, &vsi->vlan_list, next) {
> +	TAILQ_FOREACH_SAFE(v_f, &vsi->vlan_list, next, temp) {
>  		ret = ice_remove_vlan_filter(vsi, &v_f->vlan_info.vlan);
>  		if (ret != ICE_SUCCESS) {
>  			ret = -EINVAL;
> --
> 2.25.1
  

Patch

diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index 9c9b84a93..785750d9b 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -10,6 +10,8 @@ 
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include <rte_tailq.h>
+
 #include "base/ice_sched.h"
 #include "base/ice_flow.h"
 #include "base/ice_dcb.h"
@@ -1094,12 +1096,13 @@  ice_remove_all_mac_vlan_filters(struct ice_vsi *vsi)
 {
 	struct ice_mac_filter *m_f;
 	struct ice_vlan_filter *v_f;
+	void *temp;
 	int ret = 0;
 
 	if (!vsi || !vsi->mac_num)
 		return -EINVAL;
 
-	TAILQ_FOREACH(m_f, &vsi->mac_list, next) {
+	TAILQ_FOREACH_SAFE(m_f, &vsi->mac_list, next, temp) {
 		ret = ice_remove_mac_filter(vsi, &m_f->mac_info.mac_addr);
 		if (ret != ICE_SUCCESS) {
 			ret = -EINVAL;
@@ -1110,7 +1113,7 @@  ice_remove_all_mac_vlan_filters(struct ice_vsi *vsi)
 	if (vsi->vlan_num == 0)
 		return 0;
 
-	TAILQ_FOREACH(v_f, &vsi->vlan_list, next) {
+	TAILQ_FOREACH_SAFE(v_f, &vsi->vlan_list, next, temp) {
 		ret = ice_remove_vlan_filter(vsi, &v_f->vlan_info.vlan);
 		if (ret != ICE_SUCCESS) {
 			ret = -EINVAL;