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

Commit 82e2e782 authored by Stefan Raspl's avatar Stefan Raspl Committed by David S. Miller
Browse files

qeth: Fix invalid router settings handling 



Give a bad return code when specifying a router setting that is either
invalid or not support on the respective device type. In addition, fall back
the previous setting instead of silently switching back to 'no routing'.

Signed-off-by: default avatarStefan Raspl <raspl@linux.vnet.ibm.com>
Signed-off-by: default avatarFrank Blaschka <blaschka@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 82f77cf9

drivers/s390/net/qeth_l3_main.c

+11 −6
Original line number Diff line number Diff line
@@ -623,7 +623,7 @@ static int qeth_l3_send_setrouting(struct qeth_card *card, 
	return rc;

}



static void qeth_l3_correct_routing_type(struct qeth_card *card,

static int qeth_l3_correct_routing_type(struct qeth_card *card,

		enum qeth_routing_types *type, enum qeth_prot_versions prot)

{

	if (card->info.type == QETH_CARD_TYPE_IQD) {
@@ -632,7 +632,7 @@ static void qeth_l3_correct_routing_type(struct qeth_card *card, 
		case PRIMARY_CONNECTOR:

		case SECONDARY_CONNECTOR:

		case MULTICAST_ROUTER:

			return;

			return 0;

		default:

			goto out_inval;

		}
@@ -641,17 +641,18 @@ static void qeth_l3_correct_routing_type(struct qeth_card *card, 
		case NO_ROUTER:

		case PRIMARY_ROUTER:

		case SECONDARY_ROUTER:

			return;

			return 0;

		case MULTICAST_ROUTER:

			if (qeth_is_ipafunc_supported(card, prot,

						      IPA_OSA_MC_ROUTER))

				return;

				return 0;

		default:

			goto out_inval;

		}

	}

out_inval:

	*type = NO_ROUTER;

	return -EINVAL;

}



int qeth_l3_setrouting_v4(struct qeth_card *card)
@@ -660,8 +661,10 @@ int qeth_l3_setrouting_v4(struct qeth_card *card) 


	QETH_CARD_TEXT(card, 3, "setrtg4");



	qeth_l3_correct_routing_type(card, &card->options.route4.type,

	rc = qeth_l3_correct_routing_type(card, &card->options.route4.type,

				  QETH_PROT_IPV4);

	if (rc)

		return rc;



	rc = qeth_l3_send_setrouting(card, card->options.route4.type,

				  QETH_PROT_IPV4);
@@ -683,8 +686,10 @@ int qeth_l3_setrouting_v6(struct qeth_card *card) 


	if (!qeth_is_supported(card, IPA_IPV6))

		return 0;

	qeth_l3_correct_routing_type(card, &card->options.route6.type,

	rc = qeth_l3_correct_routing_type(card, &card->options.route6.type,

				  QETH_PROT_IPV6);

	if (rc)

		return rc;



	rc = qeth_l3_send_setrouting(card, card->options.route6.type,

				  QETH_PROT_IPV6);

drivers/s390/net/qeth_l3_sys.c

+2 −0
Original line number Diff line number Diff line
@@ -87,6 +87,8 @@ static ssize_t qeth_l3_dev_route_store(struct qeth_card *card, 
			rc = qeth_l3_setrouting_v6(card);

	}

out:

	if (rc)

		route->type = old_route_type;

	mutex_unlock(&card->conf_mutex);

	return rc ? rc : count;

}