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

Commit f55ea3d9 authored by Dan Carpenter's avatar Dan Carpenter Committed by David S. Miller
Browse files

niu: fix error handling in niu_class_to_ethflow() 



There is a discrepancy here because the niu_class_to_ethflow() returns
zero on failure and one on success but the caller expected zero on
success and negative on failure.

The problem means that we allow the user to pass classes and flow_types
which we don't want.  I've looked at it a bit and I don't see it as a
very serious bug.

Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b70661c7

drivers/net/ethernet/sun/niu.c

+2 −4
Original line number Diff line number Diff line
@@ -6989,10 +6989,10 @@ static int niu_class_to_ethflow(u64 class, int *flow_type) 
		*flow_type = IP_USER_FLOW;

		break;

	default:

		return 0;

		return -EINVAL;

	}



	return 1;

	return 0;

}



static int niu_ethflow_to_class(int flow_type, u64 *class)
@@ -7198,11 +7198,9 @@ static int niu_get_ethtool_tcam_entry(struct niu *np, 
	class = (tp->key[0] & TCAM_V4KEY0_CLASS_CODE) >>

		TCAM_V4KEY0_CLASS_CODE_SHIFT;

	ret = niu_class_to_ethflow(class, &fsp->flow_type);



	if (ret < 0) {

		netdev_info(np->dev, "niu%d: niu_class_to_ethflow failed\n",

			    parent->index);

		ret = -EINVAL;

		goto out;

	}