Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ddc173a6 authored Jun 14, 2016 by Raghu Vatsavayi Committed by David S. Miller Jun 15, 2016

liquidio: Avoid double free during soft command



This patch is to resolve the double free issue by checking proper return
values from soft command.

Signed-off-by: Derek Chickles <derek.chickles@caviumnetworks.com>
Signed-off-by: Satanand Burla <satananda.burla@caviumnetworks.com>
Signed-off-by: Felix Manlunas <felix.manlunas@caviumnetworks.com>
Signed-off-by: Raghu Vatsavayi <raghu.vatsavayi@caviumnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 0b797c85

drivers/net/ethernet/cavium/liquidio/lio_ethtool.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -317,7 +317,7 @@ octnet_mdio45_access(struct lio lio, int op, int loc, int value)

		retval = octeon_send_soft_command(oct_dev, sc);

		if (retval) {
		if (retval == IQ_SEND_FAILED) {
		dev_err(&oct_dev->pci_dev->dev,
		"octnet_mdio45_access instruction failed status: %x\n",
		retval);
		@@ -722,7 +722,7 @@ static int octnet_set_intrmod_cfg(void oct, struct oct_intrmod_cfg intr_cfg)
		sc->wait_time = 1000;

		retval = octeon_send_soft_command(oct_dev, sc);
		if (retval) {
		if (retval == IQ_SEND_FAILED) {
		octeon_free_soft_command(oct_dev, sc);
		return -EINVAL;
		}

drivers/net/ethernet/cavium/liquidio/lio_main.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2583,7 +2583,7 @@ static inline int send_nic_timestamp_pkt(struct octeon_device *oct,
		retval = octeon_send_command(oct, sc->iq_no, ring_doorbell, &sc->cmd,
		sc, ih->dlengsz, ndata->reqtype);

		if (retval) {
		if (retval == IQ_SEND_FAILED) {
		dev_err(&oct->pci_dev->dev, "timestamp data packet failed status: %x\n",
		retval);
		octeon_free_soft_command(oct, sc);
		@@ -3192,7 +3192,7 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)
		sc->wait_time = 1000;

		retval = octeon_send_soft_command(octeon_dev, sc);
		if (retval) {
		if (retval == IQ_SEND_FAILED) {
		dev_err(&octeon_dev->pci_dev->dev,
		"iq/oq config failed status: %x\n",
		retval);

drivers/net/ethernet/cavium/liquidio/octeon_nic.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -178,7 +178,7 @@ octnet_send_nic_ctrl_pkt(struct octeon_device *oct,
		}

		retval = octeon_send_soft_command(oct, sc);
		if (retval) {
		if (retval == IQ_SEND_FAILED) {
		octeon_free_soft_command(oct, sc);
		dev_err(&oct->pci_dev->dev, "%s soft command send failed status: %x\n",
		__func__, retval);