Delivered-To: mlmmj-tyndur-devel
Received: from sv1.famkaufmann.info [176.9.73.67]
	by a9b8c5461646 with IMAP (fetchmail-6.3.26)
	for <mlmmj@localhost> (single-drop); Tue, 23 Feb 2021 15:14:52 +0000 (GMT)
Received: from localhost ([172.29.0.7])
	by sv1.famkaufmann.info with LMTP
	id KK7TFNsbNWBLVgAALHnFKQ
	(envelope-from <mayerNico@outlook.de>)
	for <mlmmj-tyndur-devel>; Tue, 23 Feb 2021 15:14:35 +0000
Delivered-To: tyndur-devel@tyndur.org
Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073068.outbound.protection.outlook.com [40.92.73.68])
	by sv1.famkaufmann.info (OpenSMTPD) with ESMTPS id 0d9af44b (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO)
	for <tyndur-devel@tyndur.org>;
	Tue, 23 Feb 2021 15:14:33 +0000 (UTC)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
 b=fs9Fo4g1qSQWr0UF0t2fgxcNP7CeoCt6cCbuB1WW4GNQxXYalK9ToEt0iiR/F7FTX02agSZi2CgXOahg7cAYz8GRM4p9PDQBlDGMtizfNrz9R4StrYNYZNvpP8ctpLnsi1ZdmZhPf73k9iZMiJ+6WQ5pKinIuMG9d01cAR1T6RrovqU4jmbmXGh0kifVXOGs6fW510cBn6o+FXDQgtqzvQilENQ6iTYjzRDsCnq81LPuHr0eIFB+DZBtk1g0Z3h56enwuWIumYtrVFZtN+0r+X07/7M8yxf3d9ycFjsgF3kuBxvvSG3MMq9CNYy3LNtd5HRtSOJ6ZmY+v0XiNqcXLQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;
 s=arcselector9901;
 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
 bh=Bu6DfyyzLx7wYu1/XEzMeQ0F4KUhQqWh+CXW93PZrG8=;
 b=PdTFeBa67zjeVjQztuwQTMEInVwJnoe1buaMoviTx0Fazfl3wgjq6tnGLp4f6I7WRna0mATTm/EoFlrrZ+nNsR+4sH518mHeBl0/XcUE1JyMDESa0ycFOaO+qnX1t75tswCA+4osPEtomZ4Jgd0hKhmqwhiVYWTvLW7/nBJJkmhIslz7nWmdj38+9+stkOZG01wwqNjgRw3SrEwYoolawsSe6FbCRDW4twGzM92O4qzGwuWR09hRbyWmUCj+Ek1zaBukJLNuSCEYcdCmngidvn3SCWZVzMOYG861iQAHOcZ7EqQiqJ6keGndlt6cObF6jrLyxnOWkMiIKGXYlGjHkQ==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none;
 dkim=none; arc=none
Received: from VI1EUR04FT038.eop-eur04.prod.protection.outlook.com
 (2a01:111:e400:7e0e::52) by
 VI1EUR04HT206.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0e::131)
 with Microsoft SMTP Server (version=TLS1_2,
 cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27; Tue, 23 Feb
 2021 15:14:32 +0000
Received: from AM8PR04MB7266.eurprd04.prod.outlook.com
 (2a01:111:e400:7e0e::51) by VI1EUR04FT038.mail.protection.outlook.com
 (2a01:111:e400:7e0e::100) with Microsoft SMTP Server (version=TLS1_2,
 cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27 via Frontend
 Transport; Tue, 23 Feb 2021 15:14:32 +0000
X-IncomingTopHeaderMarker:
 OriginalChecksum:B4543EF572006037D91FC9D9052ECE7DBC9AC2F65AC6046229762980BACF9F9B;UpperCasedChecksum:20F3A434389983C99C4E2BD47E6CBF05B1CA02B2A917D54456F6FB99053D85C9;SizeAsReceived:8554;Count:44
Received: from AM8PR04MB7266.eurprd04.prod.outlook.com
 ([fe80::79d9:ef8a:e6bf:ed44]) by AM8PR04MB7266.eurprd04.prod.outlook.com
 ([fe80::79d9:ef8a:e6bf:ed44%6]) with mapi id 15.20.3868.033; Tue, 23 Feb 2021
 15:14:32 +0000
From: Nico Mayer <mayerNico@outlook.de>
To: tyndur-devel@tyndur.org
Subject: [PATCH] =?UTF-8?q?libc:=20Verhindern=20von=20=C3=9Cber-=20und=20U?= =?UTF-8?q?nterl=C3=A4ufe=20in=20Scanf?=
Date: Tue, 23 Feb 2021 16:14:25 +0100
Message-ID:
 <AM8PR04MB7266A9611607F4409C9EFDD8D5809@AM8PR04MB7266.eurprd04.prod.outlook.com>
X-Mailer: git-send-email 2.29.2
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-TMN: [Xw3Fd6mRY0J/B/MX2dDEr74XUxMTEpaoSW817y7gvPdlauJO+LnOP1eCO7e1ElIG]
X-ClientProxiedBy: AM9P193CA0014.EURP193.PROD.OUTLOOK.COM
 (2603:10a6:20b:21e::19) To AM8PR04MB7266.eurprd04.prod.outlook.com
 (2603:10a6:20b:1d6::20)
X-Microsoft-Original-Message-ID:
 <20210223151425.319872-1-mayerNico@outlook.de>
Errors-To: toni@tyndur.org
Precedence: list
Reply-To: tyndur-Patches <tyndur-devel@tyndur.org>
List-Id: tyndur-Patches <tyndur-devel.tyndur.org>
List-Unsubscribe: <mailto:tyndur-devel+unsubscribe@tyndur.org>
List-Post: <mailto:tyndur-devel@tyndur.org>
List-Help: <mailto:tyndur-devel+help@tyndur.org>
List-Subscribe: <mailto:tyndur-devel+subscribe@tyndur.org>
List-Owner: <mailto:toni@tyndur.org>
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from localhost.localdomain (2003:eb:4f24:ab01:f268:b1c2:b5b6:1472) by AM9P193CA0014.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:21e::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27 via Frontend Transport; Tue, 23 Feb 2021 15:14:32 +0000
X-MS-PublicTrafficType: Email
X-IncomingHeaderCount: 44
X-EOPAttributedMessage: 0
X-MS-Office365-Filtering-Correlation-Id: 55338edf-6019-4b95-9871-08d8d80db8e4
X-MS-TrafficTypeDiagnostic: VI1EUR04HT206:
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info:
	S/l9nW/A8CYFTm3hbqIRONkJgq9Hhtiwhz0Y62PIavOZFzuk+CwCm7eQTPUkgwqSPzEWn+MAlPkzmUyx3+mefJz0A/evBEQkQG8sQQRzDY5Zf0IN+GCDYL/Wfgv7sJ7MnnyUnYTgfVk+yj/ktouW7WJg7dB2JfNvYrvW98kpewXYSAtUx9RI20kkRkybEXGLmTtmryEPPHD3h89vAHAFqqD869yoOTxcj+GMJlej5vjNpb6wyCtls5BF16umrQWG6P+0QxKmkPmaCds1TYUsegDPPSClhKim+bYFVbGEUkZuP26jBW+ac/X08TpyFh77ztnuu8S3RSMXe5rGbrm/v0PnOuUiqXQUh2nTCnsOBMY74OReBtO/F4GW876i/y+gBxv0sytcUeE7GT11u8yRCA==
X-MS-Exchange-AntiSpam-MessageData:
	z8IT30so2F7ZrmTQJ+Yb+OaTnAcWiHA1H0MZr31Fa4yvsoyXbvsPZ8pAjWTa7nOgat2R7gygsx43TPrY9UOSO34xHjWotz4tzpnbFjHImAomMwzS/+qm2oxI+gxbA4OsLRYjds24G2JR/dU+2yxpz1WjQ542Trl8/f0xO2pPRtt50kQMe3QgQqahjBKeFnJkPuNwkXYPXF/5fJSME5CzJg==
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 55338edf-6019-4b95-9871-08d8d80db8e4
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Feb 2021 15:14:32.7520
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-CrossTenant-AuthSource:
	VI1EUR04FT038.eop-eur04.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: Internet
X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg:
	00000000-0000-0000-0000-000000000000
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1EUR04HT206

! Scanf limitiert die maximale Größe einer eingelesener Zahl abhängig
  von der Variablengröße. Dieser Commit implementiert dieses Verhalten.

Signed-off-by: Nico Mayer <mayerNico@outlook.de>
---
 src/lib/string.c                | 15 +++++++++++----
 src/modules/lib/stdlibc/scanf.c | 31 ++++++++++++++++++++++++++++++-
 2 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/src/lib/string.c b/src/lib/string.c
index 98861869..6eb90e98 100644
--- a/src/lib/string.c
+++ b/src/lib/string.c
@@ -67,7 +67,9 @@ void itoa(unsigned int n, char *s, unsigned int base)
 	s[y] = '\0';
 }
 
-unsigned long long int strtoull(const char *nptr, char **endptr, int base)
+unsigned long long int do_strtoull(const char *nptr, char **endptr, int base,
+                                   unsigned long long max_val,
+                                   unsigned long long min_val)
 {
     unsigned long long int result = 0;
     int neg = 0;
@@ -145,7 +147,7 @@ unsigned long long int strtoull(const char *nptr, char **endptr, int base)
                 goto out;
         }
 
-        if (result > (ULLONG_MAX - digit) / base) {
+        if (result > (max_val - digit) / base) {
             overflow = true;
         }
         result = result * base + digit;
@@ -159,15 +161,20 @@ out:
     }
 
     if (overflow) {
-        return ULLONG_MAX;
+        return neg ? min_val : max_val;
     }
 
     return neg ? - result : result;
 }
 
+unsigned long long int strtoull(const char *nptr, char **endptr, int base)
+{
+  return do_strtoull(nptr, endptr, base, ULLONG_MAX, ULLONG_MAX);
+}
+
 unsigned long int strtoul(const char *nptr, char **endptr, int base)
 {
-    return (unsigned long int) strtoull(nptr, endptr, base);
+    return (unsigned long int) do_strtoull(nptr, endptr, base, ULONG_MAX, ULLONG_MAX);
 }
 
 
diff --git a/src/modules/lib/stdlibc/scanf.c b/src/modules/lib/stdlibc/scanf.c
index 0f978606..c4d0082d 100644
--- a/src/modules/lib/stdlibc/scanf.c
+++ b/src/modules/lib/stdlibc/scanf.c
@@ -33,6 +33,12 @@
 #include <stddef.h>
 #include <string.h>
 #include <ctype.h>
+#include <limits.h>
+
+
+unsigned long long int do_strtoull(const char *nptr, char **endptr, int base,
+                                   unsigned long long max_val,
+                                   unsigned long long min_val);
 
 typedef int (*jscanf_getc)(void* state);
 typedef void (*jscanf_ungetc)(void* state, char c);
@@ -185,6 +191,7 @@ static int jscanf(const char* fmt, va_list ap,
     int c;
     char* endptr;
     uint64_t value;
+    int non_negative = 0;
 
     // 64 Bit oktal = 22 Zeichen, führende 0, Vorzeichen und \0
     char buf[25];
@@ -282,22 +289,30 @@ static int jscanf(const char* fmt, va_list ap,
                     // %p - Pointer (strtoul mit Basis 16)
                     case 'i':
                         base = 0;
+                        non_negative = 0;
                         goto convert_number;
                     case 'o':
                         base = 8;
+                        non_negative = 1;
                         goto convert_number;
                     case 'x':
                     case 'X':
+                        non_negative = 1;
                         base = 16;
                         goto convert_number;
                     case 'p':
                         base = 16;
                         size = sizeof(void*);
+                        non_negative = 1;
                         len = 0;
                         goto convert_number;
                     case 'd':
+                        base = 10;
+                        non_negative = 0;
+                        goto convert_number;
                     case 'u':
                         base = 10;
+                        non_negative = 1;
                     convert_number:
                         if (len == 0 || len >= sizeof(buf)) {
                             len = sizeof(buf) - 1;
@@ -305,7 +320,20 @@ static int jscanf(const char* fmt, va_list ap,
                         len = jscanf_read_number(buf, len, jgetc, jungetc,
                             state, base, &eof);
 
-                        value = strtoull(buf, &endptr, base);
+                        if (size == sizeof(int)) {
+                            if (non_negative) {
+                                value = do_strtoull(buf, &endptr, base, ULONG_MAX, ULONG_MAX);
+                            } else {
+                                value = do_strtoull(buf, &endptr, base, LONG_MAX, LONG_MIN);
+                            }
+                        } else {
+                            if (non_negative) {
+                                value = do_strtoull(buf, &endptr, base, ULLONG_MAX, ULLONG_MAX);
+                            } else {
+                                value = do_strtoull(buf, &endptr, base, LLONG_MAX, LLONG_MIN);
+                            }
+                        }
+
                         if ((endptr != buf + len) || (len == 0)) {
                             if ((len == 0) && eof) {
                                 goto input_error;
@@ -320,6 +348,7 @@ static int jscanf(const char* fmt, va_list ap,
                         }
                         break;
 
+
                     // %n - Anzahl der bisher gelesenen Zeichen
                     case 'n':
                         if (assign) {
-- 
2.29.2

