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

Commit b7d1479e authored by Pavel Skripkin's avatar Pavel Skripkin Committed by Greg Kroah-Hartman
Browse files

net: cipso: fix warnings in netlbl_cipsov4_add_std 



[ Upstream commit 8ca34a13f7f9b3fa2c464160ffe8cc1a72088204 ]

Syzbot reported warning in netlbl_cipsov4_add(). The
problem was in too big doi_def->map.std->lvl.local_size
passed to kcalloc(). Since this value comes from userpace there is
no need to warn if value is not correct.

The same problem may occur with other kcalloc() calls in
this function, so, I've added __GFP_NOWARN flag to all
kcalloc() calls there.

Reported-and-tested-by: default avatar <syzbot+cdd51ee2e6b0b2e18c0d@syzkaller.appspotmail.com>
Fixes: 96cb8e33 ("[NetLabel]: CIPSOv4 and Unlabeled packet integration")
Acked-by: default avatarPaul Moore <paul@paul-moore.com>
Signed-off-by: default avatarPavel Skripkin <paskripkin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 15bf24c5

net/netlabel/netlabel_cipso_v4.c

+4 −4
Original line number Diff line number Diff line
@@ -198,14 +198,14 @@ static int netlbl_cipsov4_add_std(struct genl_info *info, 
		}

	doi_def->map.std->lvl.local = kcalloc(doi_def->map.std->lvl.local_size,

					      sizeof(u32),

					      GFP_KERNEL);

					      GFP_KERNEL | __GFP_NOWARN);

	if (doi_def->map.std->lvl.local == NULL) {

		ret_val = -ENOMEM;

		goto add_std_failure;

	}

	doi_def->map.std->lvl.cipso = kcalloc(doi_def->map.std->lvl.cipso_size,

					      sizeof(u32),

					      GFP_KERNEL);

					      GFP_KERNEL | __GFP_NOWARN);

	if (doi_def->map.std->lvl.cipso == NULL) {

		ret_val = -ENOMEM;

		goto add_std_failure;
@@ -273,7 +273,7 @@ static int netlbl_cipsov4_add_std(struct genl_info *info, 
		doi_def->map.std->cat.local = kcalloc(

					      doi_def->map.std->cat.local_size,

					      sizeof(u32),

					      GFP_KERNEL);

					      GFP_KERNEL | __GFP_NOWARN);

		if (doi_def->map.std->cat.local == NULL) {

			ret_val = -ENOMEM;

			goto add_std_failure;
@@ -281,7 +281,7 @@ static int netlbl_cipsov4_add_std(struct genl_info *info, 
		doi_def->map.std->cat.cipso = kcalloc(

					      doi_def->map.std->cat.cipso_size,

					      sizeof(u32),

					      GFP_KERNEL);

					      GFP_KERNEL | __GFP_NOWARN);

		if (doi_def->map.std->cat.cipso == NULL) {

			ret_val = -ENOMEM;

			goto add_std_failure;