netdev - [PATCH netfilter] netfilter: xt_IDLETIMER: fix idletimer_tg

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20210402201156.2789453-1-zenczykowski@gmail.com>
Date:   Fri,  2 Apr 2021 13:11:56 -0700
From:   Maciej Żenczykowski <zenczykowski@...il.com>
To:     Maciej Żenczykowski <maze@...gle.com>,
        Pablo Neira Ayuso <pablo@...filter.org>,
        Florian Westphal <fw@...len.de>
Cc:     Linux Network Development Mailing List <netdev@...r.kernel.org>,
        Netfilter Development Mailing List 
        <netfilter-devel@...r.kernel.org>,
        Manoj Basapathi <manojbm@...eaurora.org>,
        Subash Abhinov Kasiviswanathan <subashab@...eaurora.org>
Subject: [PATCH netfilter] netfilter: xt_IDLETIMER: fix idletimer_tg_helper non-kosher casts

From: Maciej Żenczykowski <maze@...gle.com>

The code is relying on the identical layout of the beginning
of the v0 and v1 structs, but this can easily lead to code bugs
if one were to try to extend this further...

I use:
  char (*plabel)[MAX_IDLETIMER_LABEL_SIZE]
instead of:
  char label[MAX_IDLETIMER_LABEL_SIZE]
as the helper's argument to get better type safety
(the former checks array size, the latter does not).

Cc: Manoj Basapathi <manojbm@...eaurora.org>
Cc: Subash Abhinov Kasiviswanathan <subashab@...eaurora.org>
Signed-off-by: Maciej Żenczykowski <maze@...gle.com>
---
 net/netfilter/xt_IDLETIMER.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/net/netfilter/xt_IDLETIMER.c b/net/netfilter/xt_IDLETIMER.c
index 7b2f359bfce4..2b5e81f6e0bd 100644
--- a/net/netfilter/xt_IDLETIMER.c
+++ b/net/netfilter/xt_IDLETIMER.c
@@ -283,18 +283,19 @@ static unsigned int idletimer_tg_target_v1(struct sk_buff *skb,
 	return XT_CONTINUE;
 }
 
-static int idletimer_tg_helper(struct idletimer_tg_info *info)
+static int idletimer_tg_helper(__u32 timeout,
+			       char (*plabel)[MAX_IDLETIMER_LABEL_SIZE])
 {
-	if (info->timeout == 0) {
+	if (timeout == 0) {
 		pr_debug("timeout value is zero\n");
 		return -EINVAL;
 	}
-	if (info->timeout >= INT_MAX / 1000) {
+	if (timeout >= INT_MAX / 1000) {
 		pr_debug("timeout value is too big\n");
 		return -EINVAL;
 	}
-	if (info->label[0] == '\0' ||
-	    strnlen(info->label,
+	if ((*plabel)[0] == '\0' ||
+	    strnlen(*plabel,
 		    MAX_IDLETIMER_LABEL_SIZE) == MAX_IDLETIMER_LABEL_SIZE) {
 		pr_debug("label is empty or not nul-terminated\n");
 		return -EINVAL;
@@ -310,9 +311,8 @@ static int idletimer_tg_checkentry(const struct xt_tgchk_param *par)
 
 	pr_debug("checkentry targinfo%s\n", info->label);
 
-	ret = idletimer_tg_helper(info);
-	if(ret < 0)
-	{
+	ret = idletimer_tg_helper(info->timeout, &info->label);
+	if (ret < 0) {
 		pr_debug("checkentry helper return invalid\n");
 		return -EINVAL;
 	}
@@ -349,9 +349,8 @@ static int idletimer_tg_checkentry_v1(const struct xt_tgchk_param *par)
 	if (info->send_nl_msg)
 		return -EOPNOTSUPP;
 
-	ret = idletimer_tg_helper((struct idletimer_tg_info *)info);
-	if(ret < 0)
-	{
+	ret = idletimer_tg_helper(info->timeout, &info->label);
+	if (ret < 0) {
 		pr_debug("checkentry helper return invalid\n");
 		return -EINVAL;
 	}
-- 
2.31.0.208.g409f899ff0-goog