net/sched: taprio: always validate TCA_TAPRIO_ATTR_PRIOMAP

[ Upstream commit f921a58ae20852d188f70842431ce6519c4fdc36 ]

If one TCA_TAPRIO_ATTR_PRIOMAP attribute has been provided,
taprio_parse_mqprio_opt() must validate it, or userspace
can inject arbitrary data to the kernel, the second time
taprio_change() is called.

First call (with valid attributes) sets dev->num_tc
to a non zero value.

Second call (with arbitrary mqprio attributes)
returns early from taprio_parse_mqprio_opt()
and bad things can happen.

Fixes: a3d43c0d56 ("taprio: Add support adding an admin schedule")
Reported-by: Noam Rathaus <noamr@ssd-disclosure.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Vinicius Costa Gomes <vinicius.gomes@intel.com>
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Link: https://lore.kernel.org/r/20240604181511.769870-1-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Eric Dumazet 2024-06-04 18:15:11 +00:00 коммит произвёл Greg Kroah-Hartman
Родитель 582c32e6df
Коммит d3dde4c217
1 изменённых файлов: 6 добавлений и 9 удалений

Просмотреть файл

@ -947,16 +947,13 @@ static int taprio_parse_mqprio_opt(struct net_device *dev,
{ {
int i, j; int i, j;
if (!qopt && !dev->num_tc) { if (!qopt) {
NL_SET_ERR_MSG(extack, "'mqprio' configuration is necessary"); if (!dev->num_tc) {
return -EINVAL; NL_SET_ERR_MSG(extack, "'mqprio' configuration is necessary");
} return -EINVAL;
}
/* If num_tc is already set, it means that the user already
* configured the mqprio part
*/
if (dev->num_tc)
return 0; return 0;
}
/* Verify num_tc is not out of max range */ /* Verify num_tc is not out of max range */
if (qopt->num_tc > TC_MAX_QUEUE) { if (qopt->num_tc > TC_MAX_QUEUE) {