From patchwork Mon Nov 20 00:09:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuran Pereira X-Patchwork-Id: 13460711 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=hotmail.com header.i=@hotmail.com header.b="vE8K0F9a" Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2073.outbound.protection.outlook.com [40.92.91.73]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7DC3EE0; Sun, 19 Nov 2023 16:10:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MKL/4vcWGBLsA8DjJiSyerjTUIAGZR7fB1cKN+axB4WvLXN4fKKDwRaWp7qNks/nVBtXQP31IKpcCzimVP914d0iFccQEVaj/AAr6nmJkxwZ+qGjP2FrquO5jWqYjzGILEhY2BjOfD7ZQr6tWEO5+1V6QRGsg4cnWzUpGe7nc9VrLn6GXPh/zHKjDumSmEjxFACBnQkSJIAfHk8CFE9Y8tlhVcfvtY/mImXoieycjQ04syGoPVojnNK2rRm+nRR7/ltxBr6Fm1+pCqdmq+OYdwjQugpn1jP4ZdfNFJOyVw7siMar5PMnFbpJZ7Qn6kM5NewcxacOaZnfN7MRKy3CHw== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=P4QOcl+PaZFuwDi0ESKom6kyt9j6tcui8KvDKr3F7U4=; b=nWSnLM8Lkw7VHfNC5zDymVSTD7uJLQgjPZHfBW/lePZHizMF84otwN0E0uozgy8MxMP7Wds8NJC/FagUxj0Nn1yFDTEG0ucDe5WuQI2D/aHtbtnYgvwKcOUi064K/OpVLE5s5lZokAENWEVZTAbyjRmXK61sWkfNEXB5z1c7X3XNTy+uI8dz6RMVxEbdSoLAIp/+rpKNLytKWgtXTqoG95tmKCKG/NBe+Bo+sQ6g4Aj3vZ26f6+vYypitSRo1p7XEKVUf9CWdIGyu8K8ATZ9E7TncYmlOZL5IVCfAR5r7kfqw6G6c5LNPKUriKTR9n/HnJzNnn9k5qyeUY/0DUQsUA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=P4QOcl+PaZFuwDi0ESKom6kyt9j6tcui8KvDKr3F7U4=; b=vE8K0F9aiYHuCgHK8fYxZAGXVBS99NS607O5aF0gaDg4TdZaJmVFzYTLz33A2xWx0Z3diJ2+xkJp/2Mcy45usxWoz2+KxDQ6MQcbUyQfkqAISSsROeJ/6MxDwbS+YbfNfJNimbW12FnGsVTmdl4RpCR4r5nxdunLA5VOeKaLDlvNRjH9BjGovArC/H/j8W2pqZ2zZY7Ezbe+7/WppU642dZbq0shKB+rL9mO7vQ21FdfBxq0HAuVfirUdL2CM5NDUUgVD7y82HH4lngQ+l3poV1D3EKSJHtkz88GE2A3cNq5FJKYr2i3it1mGFf62bTmITMxzox5C9tmphC0u678PQ== Received: from GV1PR10MB6563.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:150:83::20) by AS8PR10MB6173.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:54a::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.27; Mon, 20 Nov 2023 00:09:58 +0000 Received: from GV1PR10MB6563.EURPRD10.PROD.OUTLOOK.COM ([fe80::6c45:bfdf:a384:5450]) by GV1PR10MB6563.EURPRD10.PROD.OUTLOOK.COM ([fe80::6c45:bfdf:a384:5450%7]) with mapi id 15.20.7002.026; Mon, 20 Nov 2023 00:09:58 +0000 From: Yuran Pereira To: kgdb-bugreport@lists.sourceforge.net, linux-trace-kernel@vger.kernel.org Cc: Yuran Pereira , jason.wessel@windriver.com, daniel.thompson@linaro.org, dianders@chromium.org, rostedt@goodmis.org, mhiramat@kernel.org, linux-kernel@vger.kernel.org, linux-kernel-mentees@lists.linuxfoundation.org Subject: [PATCH 2/2] trace: kdb: Replace simple_strtoul with kstrtoul in kdb_ftdump Date: Mon, 20 Nov 2023 05:39:31 +0530 Message-ID: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: X-TMN: [WHg10UELG6kZDo+wax9DDRTZrHhq9GOA] X-ClientProxiedBy: JN2P275CA0016.ZAFP275.PROD.OUTLOOK.COM (2603:1086:0:3::28) To GV1PR10MB6563.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:150:83::20) X-Microsoft-Original-Message-ID: <20231120000931.360749-1-yuran.pereira@hotmail.com> Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR10MB6563:EE_|AS8PR10MB6173:EE_ X-MS-Office365-Filtering-Correlation-Id: 0043e2f8-305c-43e9-eb33-08dbe95d0827 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lXrK6pfk9eMDSXua+6UMg6vLTYb5DgQTL3zbC5fEfj/WwsbRKOrx+o4zv9Vc1cBs7WqvGMXbWVgzpC4/fn9py4nNiCKa437uOk+QaxIuNuWgGp4JTLwAUjIFRBuB5tkK3Z95ffmUmfnJB9UnMzgRWa13H3uJjK1JEL+rO5K9CIiudzyndsR88ytGN4xLAhrLQM1USVW+wvNFz+Gk2jivQSzY4j/qIVtx7tGLTxSSgLkwgaCrP8RbetD4CkzbI9+KMILc9e0d8x8C79gJLmXXoZ6gy67/5+acy2G/QSy/j8JBGKsv99rGQgMWiK17N0M2dzj32wdMibVHIRE4p01pZQb5XL5GhXzcxbuyMQhECKazK1HoEdcem0ES6K+nGIyaAi2Df9K0sFPkZQjem9jQHNGRyRaz5GPOj45lfOYve+ADdPTxhmYmcp+ONEZCmvtnf5fRArvH7n7Cc2HONHx2B44CUKr9d4jBfRbbby0XS1Ny2n6E1fO8seKVwPfxmOlIZ7pxaO6rfINPm4dBN2Mhf23Xk8nLX2W2DKHlxjh1las1iNs5ovBB47MkwvZlAe4m+X8fmciNQQ94T+nFiCuKsAA++5ZMUG6rhhzaSGmRNvtPDJmnCW63j1d03+Ktriyx X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RKP9mj73Pe3+qqs/6VmIFcWml/Ltbgz8XylAS+FPRYI7Eh6UdrtW87mf0hWSd4laJxyLfH+HnM1Gzo3uSeXC9U9OT4Ojgp7JZWNFsnG1MwRis9UDZoczmLXZwMckyUGwxmrNKn8g0tBwW5TVdr5MHta/RxbdPUX6fxwuz3zGkRQNsqSr/4z+DB6xSBJ4knpX3aTLriUquIkpmTz2GbZigmlWUb60rbfWxwPqPL3454QPZVO6jO6L6v2tlFDb3/D2nfAVLa5lJVFNjpMSgCizf48clG70Evt0xdwWnyAKDk4Pa5D8poT7IT0+Kk/rmSjzIkq+BOmFzJXPluscUcl/dTjgn7hOfpieEcK7BpqPlZpfSyLx5RQQ5Gelu+7mdD64oSqaHGVQyG3Livs3sGmCvr26lGojqZtYy8T36npkZh/jV22lxke+mNahwYD5YKUEqTmaLbUHD5bER2p7mreKQUWSDfO6ZDfqkb1HzNSDrLHNDyrugYqNNCZWIMcOatTyvTNgZPxitj+EGMEXVpfjGkR41krB4ie+7Soig6JYuDLxOP4sBbyENWFGUsP21qDpI5x78ZWhlUz7+tGcaP/25GZKbSMkPHZYJnLVgWfKajkp+3/v6qhwSXLGojji0/FE3TSZt0y/nXRcuOJn/h/Ptvl0Xq2G10fSDSnAOeoJO21rx2I791UVxA57ZBB1P8yFBvNG8mZEiV3O6w/KBP3eh4WwILyUpJ5MhGaBc8Cm5ewJDVTvv0f7G6v2kKPzQG00EzLEWUwp8wAzsACkdwvsWv53b47feQ5wf/I1x1zhO5sJMBl29nFTA3fwswy2OahltNEhn344PN04DyuuglvzdTkWZQALg+eZ0BUHjW1poEQGyJFhyhXASO1Mj/ZEszxWQDpEB/ffVsTBFNPj0Oei2wMBRF0dAnVE4zym5CXNq7FnRADLEVwSteUFiUllgunez0yIF7gHSziU4wfvGez2KrLGf3kyml3Z3Y8guZxfV8aLbvmiBwKg+09Gi+pX0FBtA5LP3+LDq2aukBlBdpA8ncTxXA7JRIwu/kr51JUkwdLDHC2QkmsQ0i8R+du7/UvgEpCdRlgC2vuJW5NOstsckF7GbmOPaM0okv1vja9AnurylTjXh9w+ziDBcKUPD9f1SVxsvOykRV7s70N3nPiA3Q0lCEmgv7SMdCnng1OBuMCq94HIozZyKJty+efsyJ8bTf+kCRS9jSPZ/sV0WwDT0cNcjGmVkWLprTq8SvOotZ8= X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-6b909.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 0043e2f8-305c-43e9-eb33-08dbe95d0827 X-MS-Exchange-CrossTenant-AuthSource: GV1PR10MB6563.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2023 00:09:58.4302 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR10MB6173 The function simple_strtoul performs no error checking in scenarios where the input value overflows the intended output variable. This results in this function successfully returning, even when the output does not match the input string (aka the function returns successfully even when the result is wrong). Or as it was mentioned [1], "...simple_strtol(), simple_strtoll(), simple_strtoul(), and simple_strtoull() functions explicitly ignore overflows, which may lead to unexpected results in callers." Hence, the use of those functions is discouraged. This patch replaces all uses of the simple_strtoul with the safer alternatives kstrtoint and kstrtol. [1] https://www.kernel.org/doc/html/latest/process/deprecated.html#simple-strtol-simple-strtoll-simple-strtoul-simple-strtoull Signed-off-by: Yuran Pereira Reviewed-by: Douglas Anderson --- kernel/trace/trace_kdb.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/kernel/trace/trace_kdb.c b/kernel/trace/trace_kdb.c index 59857a1ee44c..3891f885e4a6 100644 --- a/kernel/trace/trace_kdb.c +++ b/kernel/trace/trace_kdb.c @@ -96,23 +96,21 @@ static int kdb_ftdump(int argc, const char **argv) { int skip_entries = 0; long cpu_file; - char *cp; + int err; int cnt; int cpu; if (argc > 2) return KDB_ARGCOUNT; - if (argc) { - skip_entries = simple_strtol(argv[1], &cp, 0); - if (*cp) + if (argc) + if (kstrtoint(argv[1], 0, &skip_entries)) skip_entries = 0; - } if (argc == 2) { - cpu_file = simple_strtol(argv[2], &cp, 0); - if (*cp || cpu_file >= NR_CPUS || cpu_file < 0 || - !cpu_online(cpu_file)) + err = kstrtol(argv[2], 0, &cpu_file); + if (err || cpu_file >= NR_CPUS || cpu_file < 0 || + !cpu_online(cpu_file)) return KDB_BADINT; } else { cpu_file = RING_BUFFER_ALL_CPUS;