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

Commit 48aea14b authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Greg Kroah-Hartman
Browse files

devlink: validate length of region addr/len 



[ Upstream commit ff3b63b8c299b73ac599b120653b47e275407656 ]

DEVLINK_ATTR_REGION_CHUNK_ADDR and DEVLINK_ATTR_REGION_CHUNK_LEN
lack entries in the netlink policy. Corresponding nla_get_u64()s
may read beyond the end of the message.

Fixes: 4e54795a ("devlink: Add support for region snapshot read command")
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Reviewed-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3c2893a7

net/core/devlink.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -3607,6 +3607,8 @@ static const struct nla_policy devlink_nl_policy[DEVLINK_ATTR_MAX + 1] = { 
	[DEVLINK_ATTR_PARAM_VALUE_CMODE] = { .type = NLA_U8 },

	[DEVLINK_ATTR_PARAM_VALUE_CMODE] = { .type = NLA_U8 },

	[DEVLINK_ATTR_REGION_NAME] = { .type = NLA_NUL_STRING },

	[DEVLINK_ATTR_REGION_NAME] = { .type = NLA_NUL_STRING },

	[DEVLINK_ATTR_REGION_SNAPSHOT_ID] = { .type = NLA_U32 },

	[DEVLINK_ATTR_REGION_SNAPSHOT_ID] = { .type = NLA_U32 },

	[DEVLINK_ATTR_REGION_CHUNK_ADDR] = { .type = NLA_U64 },

	[DEVLINK_ATTR_REGION_CHUNK_LEN] = { .type = NLA_U64 },

};

};





static const struct genl_ops devlink_nl_ops[] = {

static const struct genl_ops devlink_nl_ops[] = {