Unverified Commit 8bb0daac authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!8026 [sync] PR-7961: net: atlantic: eliminate double free in error handling logic 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/7961 
 
PR sync from: Ziyang Xuan <william.xuanziyang@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/UUBCKZ4W2I6D75VVBGHFOKQPETGYCMFR/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9Q919 
 
Link:https://gitee.com/openeuler/kernel/pulls/8026

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents f1c0a299 370c5d83

drivers/net/ethernet/aquantia/atlantic/aq_ptp.c

+10 −18
Original line number Diff line number Diff line
@@ -953,8 +953,6 @@ int aq_ptp_ring_alloc(struct aq_nic_s *aq_nic) 
{

	struct aq_ptp_s *aq_ptp = aq_nic->aq_ptp;

	unsigned int tx_ring_idx, rx_ring_idx;

	struct aq_ring_s *hwts;

	struct aq_ring_s *ring;

	int err;



	if (!aq_ptp)
@@ -962,29 +960,23 @@ int aq_ptp_ring_alloc(struct aq_nic_s *aq_nic) 


	tx_ring_idx = aq_ptp_ring_idx(aq_nic->aq_nic_cfg.tc_mode);



	ring = aq_ring_tx_alloc(&aq_ptp->ptp_tx, aq_nic,

	err = aq_ring_tx_alloc(&aq_ptp->ptp_tx, aq_nic,

			       tx_ring_idx, &aq_nic->aq_nic_cfg);

	if (!ring) {

		err = -ENOMEM;

	if (err)

		goto err_exit;

	}



	rx_ring_idx = aq_ptp_ring_idx(aq_nic->aq_nic_cfg.tc_mode);



	ring = aq_ring_rx_alloc(&aq_ptp->ptp_rx, aq_nic,

	err = aq_ring_rx_alloc(&aq_ptp->ptp_rx, aq_nic,

			       rx_ring_idx, &aq_nic->aq_nic_cfg);

	if (!ring) {

		err = -ENOMEM;

	if (err)

		goto err_exit_ptp_tx;

	}



	hwts = aq_ring_hwts_rx_alloc(&aq_ptp->hwts_rx, aq_nic, PTP_HWST_RING_IDX,

	err = aq_ring_hwts_rx_alloc(&aq_ptp->hwts_rx, aq_nic, PTP_HWST_RING_IDX,

				    aq_nic->aq_nic_cfg.rxds,

				    aq_nic->aq_nic_cfg.aq_hw_caps->rxd_size);

	if (!hwts) {

		err = -ENOMEM;

	if (err)

		goto err_exit_ptp_rx;

	}



	err = aq_ptp_skb_ring_init(&aq_ptp->skb_ring, aq_nic->aq_nic_cfg.rxds);

	if (err != 0) {

drivers/net/ethernet/aquantia/atlantic/aq_ring.c

+16 −45
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static int aq_get_rxpages(struct aq_ring_s *self, struct aq_ring_buff_s *rxbuf, 
	return 0;

}



static struct aq_ring_s *aq_ring_alloc(struct aq_ring_s *self,

static int aq_ring_alloc(struct aq_ring_s *self,

			 struct aq_nic_s *aq_nic)

{

	int err = 0;
@@ -128,46 +128,29 @@ static struct aq_ring_s *aq_ring_alloc(struct aq_ring_s *self, 
err_exit:

	if (err < 0) {

		aq_ring_free(self);

		self = NULL;

	}



	return self;

	return err;

}



struct aq_ring_s *aq_ring_tx_alloc(struct aq_ring_s *self,

int aq_ring_tx_alloc(struct aq_ring_s *self,

		     struct aq_nic_s *aq_nic,

		     unsigned int idx,

		     struct aq_nic_cfg_s *aq_nic_cfg)

{

	int err = 0;



	self->aq_nic = aq_nic;

	self->idx = idx;

	self->size = aq_nic_cfg->txds;

	self->dx_size = aq_nic_cfg->aq_hw_caps->txd_size;



	self = aq_ring_alloc(self, aq_nic);

	if (!self) {

		err = -ENOMEM;

		goto err_exit;

	}



err_exit:

	if (err < 0) {

		aq_ring_free(self);

		self = NULL;

	}



	return self;

	return aq_ring_alloc(self, aq_nic);

}



struct aq_ring_s *aq_ring_rx_alloc(struct aq_ring_s *self,

int aq_ring_rx_alloc(struct aq_ring_s *self,

		     struct aq_nic_s *aq_nic,

		     unsigned int idx,

		     struct aq_nic_cfg_s *aq_nic_cfg)

{

	int err = 0;



	self->aq_nic = aq_nic;

	self->idx = idx;

	self->size = aq_nic_cfg->rxds;
@@ -178,22 +161,10 @@ struct aq_ring_s *aq_ring_rx_alloc(struct aq_ring_s *self, 
	if (aq_nic_cfg->rxpageorder > self->page_order)

		self->page_order = aq_nic_cfg->rxpageorder;



	self = aq_ring_alloc(self, aq_nic);

	if (!self) {

		err = -ENOMEM;

		goto err_exit;

	}



err_exit:

	if (err < 0) {

		aq_ring_free(self);

		self = NULL;

	return aq_ring_alloc(self, aq_nic);

}



	return self;

}



struct aq_ring_s *

int

aq_ring_hwts_rx_alloc(struct aq_ring_s *self, struct aq_nic_s *aq_nic,

		      unsigned int idx, unsigned int size, unsigned int dx_size)

{
@@ -211,10 +182,10 @@ aq_ring_hwts_rx_alloc(struct aq_ring_s *self, struct aq_nic_s *aq_nic, 
					   GFP_KERNEL);

	if (!self->dx_ring) {

		aq_ring_free(self);

		return NULL;

		return -ENOMEM;

	}



	return self;

	return 0;

}



int aq_ring_init(struct aq_ring_s *self, const enum atl_ring_type ring_type)

drivers/net/ethernet/aquantia/atlantic/aq_ring.h

+13 −11
Original line number Diff line number Diff line
@@ -167,14 +167,15 @@ static inline unsigned int aq_ring_avail_dx(struct aq_ring_s *self) 
		self->sw_head - self->sw_tail - 1);

}



struct aq_ring_s *aq_ring_tx_alloc(struct aq_ring_s *self,

int aq_ring_tx_alloc(struct aq_ring_s *self,

		     struct aq_nic_s *aq_nic,

		     unsigned int idx,

		     struct aq_nic_cfg_s *aq_nic_cfg);

struct aq_ring_s *aq_ring_rx_alloc(struct aq_ring_s *self,

int aq_ring_rx_alloc(struct aq_ring_s *self,

		     struct aq_nic_s *aq_nic,

		     unsigned int idx,

		     struct aq_nic_cfg_s *aq_nic_cfg);



int aq_ring_init(struct aq_ring_s *self, const enum atl_ring_type ring_type);

void aq_ring_rx_deinit(struct aq_ring_s *self);

void aq_ring_free(struct aq_ring_s *self);
@@ -188,9 +189,10 @@ int aq_ring_rx_clean(struct aq_ring_s *self, 
		     int budget);

int aq_ring_rx_fill(struct aq_ring_s *self);



struct aq_ring_s *aq_ring_hwts_rx_alloc(struct aq_ring_s *self,

int aq_ring_hwts_rx_alloc(struct aq_ring_s *self,

			  struct aq_nic_s *aq_nic, unsigned int idx,

			  unsigned int size, unsigned int dx_size);



void aq_ring_hwts_rx_free(struct aq_ring_s *self);

void aq_ring_hwts_rx_clean(struct aq_ring_s *self, struct aq_nic_s *aq_nic);

drivers/net/ethernet/aquantia/atlantic/aq_vec.c

+6 −10
Original line number Diff line number Diff line
@@ -142,23 +142,19 @@ int aq_vec_ring_alloc(struct aq_vec_s *self, struct aq_nic_s *aq_nic, 
		const unsigned int idx_ring = AQ_NIC_CFG_TCVEC2RING(aq_nic_cfg,

								    i, idx);



		ring = aq_ring_tx_alloc(&self->ring[i][AQ_VEC_TX_ID], aq_nic,

					idx_ring, aq_nic_cfg);

		if (!ring) {

			err = -ENOMEM;

		ring = &self->ring[i][AQ_VEC_TX_ID];

		err = aq_ring_tx_alloc(ring, aq_nic, idx_ring, aq_nic_cfg);

		if (err)

			goto err_exit;

		}



		++self->tx_rings;



		aq_nic_set_tx_ring(aq_nic, idx_ring, ring);



		ring = aq_ring_rx_alloc(&self->ring[i][AQ_VEC_RX_ID], aq_nic,

					idx_ring, aq_nic_cfg);

		if (!ring) {

			err = -ENOMEM;

		ring = &self->ring[i][AQ_VEC_RX_ID];

		err = aq_ring_rx_alloc(ring, aq_nic, idx_ring, aq_nic_cfg);

		if (err)

			goto err_exit;

		}



		++self->rx_rings;

	}