From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3A7D0C4332F for ; Fri, 10 Nov 2023 19:11:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AB8C3440151; Fri, 10 Nov 2023 14:11:09 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A410D8D0005; Fri, 10 Nov 2023 14:11:09 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8BADA440151; Fri, 10 Nov 2023 14:11:09 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 768F28D0005 for ; Fri, 10 Nov 2023 14:11:09 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 4DE1F160CF7 for ; Fri, 10 Nov 2023 19:11:09 +0000 (UTC) X-FDA: 81442987458.20.0832032 Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by imf10.hostedemail.com (Postfix) with ESMTP id 92BEFC0017 for ; Fri, 10 Nov 2023 19:11:07 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=EyanW5DQ; spf=pass (imf10.hostedemail.com: domain of ov.wagle@gmail.com designates 209.85.210.172 as permitted sender) smtp.mailfrom=ov.wagle@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1699643467; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=BbEbYA9xamOrAMfvycHRway68YHS/nLJtvjFfgGL1Mc=; b=EejWCEkJqJ4ilEs8ky8vZBLS3+UIBlMvdjO1rkp/DW0qL+tPU5V5/8Q6qgYkShRsADBp/w A4Vt/+A8T2O1Xr7soCTBl9xGXvSMQoggyEOVo5KltnsTrnBLw/p5VX1UsLF8j0ko2e9fXC y1VgbPgDDNdM4mgiudbuHyVDvu+HUHQ= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=EyanW5DQ; spf=pass (imf10.hostedemail.com: domain of ov.wagle@gmail.com designates 209.85.210.172 as permitted sender) smtp.mailfrom=ov.wagle@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1699643467; a=rsa-sha256; cv=none; b=IcIt2qiasYogJXQtn1t7q6HM0qG73noUbIjXtf6B2qLE1A1EyGSks7HdavziHAlBQAf77y Z+k3IqE6T3b4wUWIWIgR34EVaCgDkABkUI/SooUQMFutpK0HUxdU5dYiwdcdmhSviSRzVq hISxGlIfA7NvZOwGEOzqSeFXT8ar424= Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-6c4ed8eef16so627448b3a.0 for ; Fri, 10 Nov 2023 11:11:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699643466; x=1700248266; darn=kvack.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=BbEbYA9xamOrAMfvycHRway68YHS/nLJtvjFfgGL1Mc=; b=EyanW5DQ0vK9FkNkEdCfo8uUuwmszDcQmNELORouznqBYlMcXu0ERAUcCyxmnnH7Mo OrykhAutpLvT/OMwnUrKBY/oVfyhM5kGbU53E19NKQc0HyCp8Rv9NGpacFEvqzMkOnuE k4VSHTUjgLWSVAwvGGQeCu8D0Dz0i9goFEZbS5jROJFTbEV7eXPGv2n1ci1ioe8cXgOa j+LxjggRLduQV4CYHMYohQXsWzkT3S1AmmGApAP+8DWNvaKOJ8R9OkX1EihaMAg9Mdjl 23o7zz2lceU4ufquOnqF9zZieuR09kaUyj8gce23/79uZ37Chj3wM1npc2tJ95bR5rAb HRvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699643466; x=1700248266; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=BbEbYA9xamOrAMfvycHRway68YHS/nLJtvjFfgGL1Mc=; b=UbvUs/Q3NqtWO8FlFYVKUpZXFTj6uLDoD/kgQ+PGrRyEO9p/twAgMcB0Yegdzx7WCK vi1y4IBLj3luN49KL+I0dIkW2PISWXTnP4+IYu1+XwdNO4mTfOrll/3HVKQo5m41T07V H1oAGisgVYDw0wq72eVcHG3svEl4+wjn/V04ICRIGTGjFgv++NvSkq5oSHrf0Ytk1Ste DYBuzqMj8JTx6l7pr9PkzQ/f3ek+mWhtZTAR1oqR9freVaMRMk0jx6by/tvYuW3SNdkm VRTBPg0Za+OBGfSXacXPqnnEPOIj+3bESxp8Yb+OKyIj+WkIV2ETEMmy+7x1g1EOj2I+ z1Wg== X-Gm-Message-State: AOJu0YynZOCsdTfSs2/o0SeeHpf1kH6q9kqxm1d9ehZHaFO69kGGe9F7 T6AymEkJsY/GWlldWLVyiOZHeZJTYNffVA== X-Google-Smtp-Source: AGHT+IE43TNuGQWohhIGg54xObrNbXPCGBQ46cNESuWQKjQAy9BT56Sn9aSe/EHJMF5gcuvLcJsumA== X-Received: by 2002:a05:6a20:6a9c:b0:185:ebfc:974 with SMTP id bi28-20020a056a206a9c00b00185ebfc0974mr35305pzb.7.1699643466251; Fri, 10 Nov 2023 11:11:06 -0800 (PST) Received: from omkarwagle.hsd1.ca.comcast.net (c-73-92-27-236.hsd1.ca.comcast.net. [73.92.27.236]) by smtp.gmail.com with ESMTPSA id u16-20020a056a00125000b0068c90e1ec84sm36974pfi.167.2023.11.10.11.11.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Nov 2023 11:11:05 -0800 (PST) From: Omkar Wagle To: catalin.marinas@arm.com Cc: akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Omkar Wagle Subject: [PATCH] mm: kmemleak: Remove security and coding style warning Date: Fri, 10 Nov 2023 11:11:02 -0800 Message-Id: <20231110191102.2029-1-ov.wagle@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 92BEFC0017 X-Rspam-User: X-Stat-Signature: dtfyj3k7pbzedeiw74a84mj9u6nmqzqx X-Rspamd-Server: rspam01 X-HE-Tag: 1699643467-199982 X-HE-Meta: U2FsdGVkX1/TLiq29nhbcO2wuB1yMSDMVK0lzr3m50Dc8gTkX4BxO5624CYhRP6ooe5HPYIkQO/6EQCBPBmF/2XYkPHv4F1vAhbEYE1brDbCsGxFGeEODYmkiV7D5ubMVfDeZsNND+YLFDHJfU9/8I7oa+H4QlhqndBNAzPCTYoS+NBKBVwF6aEvtBSl99xsqUYPwF/IJBjAgQZoBkBvxS4qw1Hhb6mBImQw2JaK55+b4mMpEEnKClP6STz2xsdzHf/9BeSKryXVlWA3ow0wOAkFQaJkX1G0N8gc0AFKg1W6XPQD+ZzjzHFJBgMzu9keBy0j1PCHqA9SLZnOx0cqWNDDMDFB8jGIM90EOjCRROx2/ngU7lbJzjhNfuguxo9VaLrWrcXCPDVCt4IoYdZ4CjzrhyMrTp/LkckFMbC92QdxeycsD199KL0n1/hZgifRtJ4CEECly0fSyOYJclN5LQrbSiQtCLUrg8VN4n/SoCSWPnrLLXxvbsNd1SMYcZuPfU9o76V8GMFd4nxkwAGpqOIN3d8HUv4V+6mI7MXkNIajFDk67txKzuzuss6XOMMFWerhf3yUvpzXYpyAMnas8iuinmJGgmd3z5dtDQywN7wRzsm16qRzeuw9J/n1r3mXrXfQ2YoVPjIO1/HZjC9uUdr7VQT5EcJMG8xYi1alsXI01ErECSIBOPrLnFDuDPrxli963YGtSmpPB09fXVXTImfU/OxSA5GoP4H9rqxqYIB5lr61dhVGXycLgNI75qC/+Ghae4RarRsWXGm4LnQ7a7rzvwDQyHtDqTqMa9X20An4qpLGb+zJKRjzrwx1Zz45smiGgu6Wyf1DCa4njsEyb1+a/cCajZTRBR+LZRP9foaEfqGvEnmXGLMe6aHEiJg2V0pPHuBzvCvvLeelAaWCxZiUtP1otlOPjmSG7/wGfDBmURDI4ujzUhfQMfimGrZoUdjCIliFM62RtEFmys3 R8D1enj3 q37Dbk6FufCVseJG5gwlEobuEv6xM8W3MtIx540faj96HFjDVAV+GrjUPMB+vOwQ6MthSTnPlFNBgIzhSejd0biA8BRLiiU/jh/vMr/nYgN3LnWFqB/n44BdjncxgnMqe+PpAlt322GGG6N8ehNQVjAGWEe7tDCkI6l+qK0/QUFcShTUq/eyuRNDQ/GFKJ1/2zoP1NG6tBk1xCyJc7xUcO2S+S7Le7bbvEadYgGhlgZZYFi81vdidyXM+hRUCpFbDgI6OWoL71ZTk1A7iXntfPK0o4YTQqeGgpUUsXC9vcOYkptFKFh3sdDfr58axPLAU9lQ+NdsXjKL2uJssljt8k92zlDHGSCxw08uGJu7Nk1EgW9mNk4ekdjmfPXTCRGPAAoUDZHUyi5VrR/gNvj40u9s3bcP7sODyUkCzpdGHuWG+TNPUqCRVyl/yzP0h46arlFArxK+brCOtjW6BzTR9FY7LaxzCAeLZ8Gx46O/9wKIvUOJjWoGxgAd+7MvDw1vWigDTp1HJfsEwQzvmtcrifarbFEJojzV+mzZyHK6l4kw3XfSfSyDfVEjk17cppE+a31acnNztxH6uqnz5FzbL4Fhc6NW7xyQ51eM4 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Remove the security warning arised due to the use of strncpy Resolve coding style warning Signed-off-by: Omkar Wagle --- mm/kmemleak.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/mm/kmemleak.c b/mm/kmemleak.c index 1eacca03bedd..93b77288754a 100644 --- a/mm/kmemleak.c +++ b/mm/kmemleak.c @@ -1,6 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * mm/kmemleak.c * * Copyright (C) 2008 ARM Limited * Written by Catalin Marinas @@ -97,7 +96,7 @@ #include #include -#include +#include #include #include @@ -368,6 +367,7 @@ static void print_unreferenced(struct seq_file *seq, for (i = 0; i < nr_entries; i++) { void *ptr = (void *)entries[i]; + warn_or_seq_printf(seq, " [<%pK>] %pS\n", ptr, ptr); } } @@ -406,10 +406,11 @@ static struct kmemleak_object *__lookup_object(unsigned long ptr, int alias, unsigned long untagged_ptr = (unsigned long)kasan_reset_tag((void *)ptr); while (rb) { - struct kmemleak_object *object; + struct kmemleak_object *object = NULL; unsigned long untagged_objp; object = rb_entry(rb, struct kmemleak_object, rb_node); + untagged_objp = (unsigned long)kasan_reset_tag((void *)object->pointer); if (untagged_ptr < untagged_objp) @@ -674,10 +675,10 @@ static int __link_object(struct kmemleak_object *object, unsigned long ptr, /* task information */ if (in_hardirq()) { object->pid = 0; - strncpy(object->comm, "hardirq", sizeof(object->comm)); + strscpy(object->comm, "hardirq", sizeof(object->comm)); } else if (in_serving_softirq()) { object->pid = 0; - strncpy(object->comm, "softirq", sizeof(object->comm)); + strscpy(object->comm, "softirq", sizeof(object->comm)); } else { object->pid = current->pid; /* @@ -686,7 +687,7 @@ static int __link_object(struct kmemleak_object *object, unsigned long ptr, * dependency issues with current->alloc_lock. In the worst * case, the command line is not correct. */ - strncpy(object->comm, current->comm, sizeof(object->comm)); + strscpy(object->comm, current->comm, sizeof(object->comm)); } /* kernel backtrace */ @@ -1662,6 +1663,7 @@ static void kmemleak_scan(void) rcu_read_lock(); for_each_process_thread(g, p) { void *stack = try_get_task_stack(p); + if (stack) { scan_block(stack, stack + THREAD_SIZE, NULL); put_task_stack(p); @@ -1768,6 +1770,7 @@ static int kmemleak_scan_thread(void *arg) */ if (first_run) { signed long timeout = msecs_to_jiffies(SECS_FIRST_SCAN * 1000); + first_run = 0; while (timeout && !kthread_should_stop()) timeout = schedule_timeout_interruptible(timeout); @@ -2013,7 +2016,7 @@ static ssize_t kmemleak_write(struct file *file, const char __user *user_buf, else if (strncmp(buf, "scan=off", 8) == 0) stop_scan_thread(); else if (strncmp(buf, "scan=", 5) == 0) { - unsigned secs; + unsigned int secs; unsigned long msecs; ret = kstrtouint(buf + 5, 0, &secs); @@ -2130,8 +2133,7 @@ static int __init kmemleak_boot_config(char *str) else if (strcmp(str, "on") == 0) { kmemleak_skip_disable = 1; stack_depot_request_early_init(); - } - else + } else return -EINVAL; return 0; } -- 2.34.1