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 5B328C4332F for ; Wed, 8 Nov 2023 06:28:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BCA5180011; Wed, 8 Nov 2023 01:28:04 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B796A8000D; Wed, 8 Nov 2023 01:28:04 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A40C480011; Wed, 8 Nov 2023 01:28:04 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 91E8D8000D for ; Wed, 8 Nov 2023 01:28:04 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 65741A01C9 for ; Wed, 8 Nov 2023 06:28:04 +0000 (UTC) X-FDA: 81433806888.01.8188A3B Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by imf23.hostedemail.com (Postfix) with ESMTP id A522F14000D for ; Wed, 8 Nov 2023 06:28:02 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=ISUMrrxv; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf23.hostedemail.com: domain of ov.wagle@gmail.com designates 209.85.215.170 as permitted sender) smtp.mailfrom=ov.wagle@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1699424882; 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=9jF1QK+yyjyKZImYz9gxPKsB+w+B6p6y+hlZQwC+t44=; b=6bSxqplf5ON8l5sH2izSTbLDKgiWmXvGJQnow1HsPnQlb5IOj7Oa6yF0dIofVcZ8m7pk+K Fr8i7C20IG/AisbcwVTGf4mox9D8El2VFnoz+AFzZe38/C2wCIE76hr3HNUoGkWcwKXfsC kwFVfxPK1uzQSAvJXDljWVMITP8rLQY= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=ISUMrrxv; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf23.hostedemail.com: domain of ov.wagle@gmail.com designates 209.85.215.170 as permitted sender) smtp.mailfrom=ov.wagle@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1699424882; a=rsa-sha256; cv=none; b=JNbV7f2gyOl+6ni/l+vC3LYx2C+WImtBjV58fHhdPFlmxdF+8LNLkh9QYj6RBZ3H6Uiqtj bCAY5SWcBIqHhEKPNH4T4PWEh3syNUuJUAre2sGsKaTlmnw5STsGWGVQwzu8uE7whjjlMj 2VrJfd12dstIv9Lx3wxmYS3pnvtU/Nc= Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-5bd6ac9833fso2167755a12.0 for ; Tue, 07 Nov 2023 22:28:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699424881; x=1700029681; 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=9jF1QK+yyjyKZImYz9gxPKsB+w+B6p6y+hlZQwC+t44=; b=ISUMrrxvBnHWlurjFC4KjJmANZnBTsUVC/s45e2fgAynBtFuL4OQNX+pLnHJ9sf9lD H9gGC3sa3rB1/HNi+FJhnCwthAloDl7sO2kvOt1Fj3xWiKT3ebkU68tTs1Wq/wvyoCBt tdZeI9ZHJpIk+NteznwkB8aCjPTGeqRWWrWQpG+okOtCNx7Wk/qIya7u093jjkyZybiw FBpcDDiBAiIgQeHeSiA947Gn+8RiP9LDOrIn8q8cKa5+lW134PjzWJ7LgbjvqZebwsjR JIVVvTpaNfI7I1dBET57ZKrHZ2FFL8tu29cjT2cuqhQ5hDnoouGmab7l3jLEQDchVqUD 6E0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699424881; x=1700029681; 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=9jF1QK+yyjyKZImYz9gxPKsB+w+B6p6y+hlZQwC+t44=; b=VsaS1LpNiDz3y2yqOrGdO41lCQsEMParqvId68ZA86fPLcGxJvY6IVoua4SIqsPfzM 4SaWwKtsw7V3Jeho8X33Z7co/MrDU9CqLG4nDaOvvZTbFRxxOM/XLg2ro0F+ms5g3+KB 5tMcUO4/aIgRIv6N+lZIdiEeCSdMw1Pe2QbmWh8BHtyagkCbl33EAv1qMNubTSPxe6sc KxGOcoVLF28XzDrOveRchQJ0SuFjtMBlKKxsf8lKJ6kQkWcSsCG0nFhA7Nhnc3p1pehU 5AvfKUNmiaGHL+m4BBaMoZ9qpo4nyhMu218Fz1kMWbAE09md6Opx6jVffVOuO1hIaJzN 0hMw== X-Gm-Message-State: AOJu0YyRyAhQkUkzFKUrU1ywqIVCQB5MilvYtq7txLuLGj5msR4D9Msf fHYJniJlnFN5Ih/RZbNEYvw= X-Google-Smtp-Source: AGHT+IFm/t9bE3MqSJoZetIa9IO7EJjqkxlX3hPrSaCg8YueuSwL8q9rWULMP7cAmCa2oeQzSdiWsQ== X-Received: by 2002:a05:6a21:3390:b0:16b:7602:15b1 with SMTP id yy16-20020a056a21339000b0016b760215b1mr1231540pzb.12.1699424881300; Tue, 07 Nov 2023 22:28:01 -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 x17-20020a170902821100b001cc31dcec49sm880956pln.146.2023.11.07.22.28.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 22:28:00 -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: Removed coding style warnings and added a NULL check Date: Tue, 7 Nov 2023 22:27:56 -0800 Message-Id: <20231108062756.8129-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: A522F14000D X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: uzteirs37d9d8kwbxcxfqcxmepct9na4 X-HE-Tag: 1699424882-246246 X-HE-Meta: U2FsdGVkX1+7bc7854nQYT2CiWa1442EhGBU6U7vUPKZD6ptsjfdxT0gK68IbbAOAZarQGZo9sS1xwKmOjEuDYDpuj7Rb0UP3h0e54oYt4PrwDoL4yTDL8hiDaCU3XFiNpFyjrFQI97dGQ1zrDyPWOoW/cEJCbatm1MXwzJveG7GHa6xtfDIs6QJ9YUhrVO/QLzHzK8FeCo9QsEwySvYC2AgTH5HrhcJY+QIvDDC3aobdro676kfzsb0XNTUOI/r083XrNOwEQjvx/7orfncRLA8Ftirc8KVf9TqjTkrHzQn8CAoJbgIffcHHke8AI7b1r4GXIIOPvd3qSdzPAvZJlp5xrdhOLTULRccYSgbiZIjkohbCjIgNCfo6TqdCtE0u4loY5l2wFdb+utXEzAAOSr79Lb2qoi5O2LjnaNKdd8srUGrUZAjC/bkR+vTlenDc6CPVlMcgwjs0iYBwjykKSo5DHOWxlE2nIc5Q/vAEFq+cMxVgsttlhl4L45r3XEJNVWmywQdwsVT3nMFdtDm+pjsa9R1q42ptbU+46dnhiNfnPqRmL0IJRr53l4VyWhYZD6JBmcX8F5ThTWk2f+RNzFG0oGC3dNkd1nctIF9ek2VDSchdrT8gEcgAth7YwCit7ZaY0dQFzJbF/b34WkU+kaOdB8+i3MfUAd+OsgndFPy6YyYl9HHGKyNl8UxaR1ClP6LfHZobqG4vq5+j6aL3c0qw1O8UsbntvAnZ5qEf0B4X3evhsFeFORCVpSUg99WYLhVFTVAol5MC4KK+CAU4BR084QqO3DgjDywV9qDEcjhSfn9timCsPw5hx3u3kHDNPMZpfXs/c/CwdsS/msRa4BUmUsZNNX5S3ymtEPvq1S++s5k9/3+w5ezBz6tIEqZRprk8MH2Dueo15Y0VSfIUxfJ4pY1KWYk3F1X/OHiIt16OPc8Y92qB2kYQ5Gx/xN1SXGcoY1CZUj8mPxPMk0 JLtzqQRR Jm1GJP9JWXoJLuIl28o/gOzBi3rY2/oNXDDN6Z0gNYZsr2UAIy03tsICefMWcA+KVdXgj5hvligu9OXJPY3aHGJwSL5UtZBRTi4UFN2QzkGzVcCRjuxI1tIjO7BIATmT1l4FnJAOIuBkR/YP+dFplsNHTB6LPiTaJaHCbipxMjvRUtmHYEKyGaVsftiwnBbBB1JymDfqbq3TswEtX7ph4mdIbKfUGOOhdbjilhmbogipC0AybuaeQrYj59gSNgRPdiE8YukJDQClgg0weqNYYqvRpdEoN/SLO7YPy7cSV9d10zTqgOsmSi3ORum2CJtMR0MWbG8geLh3ToF5nV7hXGtrnk9cP6qu+C9DiUj8D5qrf2YyjPLIOhJi1S0Kw8u61vfmEoYRUZNYVncCARCIr/ohz27UU/HOrw7/J5ghMolkML/S6XmhBNF1bnvvBO6DNV0iDXzMDDH7JLIzTvoOXnqjtWB4XId16CnLBGdoJ5afUAnibVNkSagpd4WS100LuC5Iddh094jan+mb5LS5MXaoMMYy61hYpI8Ur57L26PkFFEtvh/DzvgeL0zGi4igfNmJ5p8rMNJGhN5rerkSEjHWWzIv7nH8lgx+t 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: Fixed most of the coding style warnings Added a NULL check to "object" pointer before accessing its members Signed-off-by: Omkar Wagle --- mm/kmemleak.c | 50 +++++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/mm/kmemleak.c b/mm/kmemleak.c index 1eacca03bedd..a7b74dc3ff01 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,13 @@ 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); + if (!object) + break; + untagged_objp = (unsigned long)kasan_reset_tag((void *)object->pointer); if (untagged_ptr < untagged_objp) @@ -674,10 +677,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 +689,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 */ @@ -1027,7 +1030,7 @@ static void object_no_scan(unsigned long ptr) void __ref kmemleak_alloc(const void *ptr, size_t size, int min_count, gfp_t gfp) { - pr_debug("%s(0x%px, %zu, %d)\n", __func__, ptr, size, min_count); + pr_debug("%s(0x%p, %zu, %d)\n", __func__, ptr, size, min_count); if (kmemleak_enabled && ptr && !IS_ERR(ptr)) create_object((unsigned long)ptr, size, min_count, gfp); @@ -1048,7 +1051,7 @@ void __ref kmemleak_alloc_percpu(const void __percpu *ptr, size_t size, { unsigned int cpu; - pr_debug("%s(0x%px, %zu)\n", __func__, ptr, size); + pr_debug("%s(0x%p, %zu)\n", __func__, ptr, size); /* * Percpu allocations are only scanned and not reported as leaks @@ -1072,7 +1075,7 @@ EXPORT_SYMBOL_GPL(kmemleak_alloc_percpu); */ void __ref kmemleak_vmalloc(const struct vm_struct *area, size_t size, gfp_t gfp) { - pr_debug("%s(0x%px, %zu)\n", __func__, area, size); + pr_debug("%s(0x%p, %zu)\n", __func__, area, size); /* * A min_count = 2 is needed because vm_struct contains a reference to @@ -1095,7 +1098,7 @@ EXPORT_SYMBOL_GPL(kmemleak_vmalloc); */ void __ref kmemleak_free(const void *ptr) { - pr_debug("%s(0x%px)\n", __func__, ptr); + pr_debug("%s(0x%p)\n", __func__, ptr); if (kmemleak_free_enabled && ptr && !IS_ERR(ptr)) delete_object_full((unsigned long)ptr); @@ -1113,7 +1116,7 @@ EXPORT_SYMBOL_GPL(kmemleak_free); */ void __ref kmemleak_free_part(const void *ptr, size_t size) { - pr_debug("%s(0x%px)\n", __func__, ptr); + pr_debug("%s(0x%p)\n", __func__, ptr); if (kmemleak_enabled && ptr && !IS_ERR(ptr)) delete_object_part((unsigned long)ptr, size, false); @@ -1131,7 +1134,7 @@ void __ref kmemleak_free_percpu(const void __percpu *ptr) { unsigned int cpu; - pr_debug("%s(0x%px)\n", __func__, ptr); + pr_debug("%s(0x%p)\n", __func__, ptr); if (kmemleak_free_enabled && ptr && !IS_ERR(ptr)) for_each_possible_cpu(cpu) @@ -1152,7 +1155,7 @@ void __ref kmemleak_update_trace(const void *ptr) struct kmemleak_object *object; unsigned long flags; - pr_debug("%s(0x%px)\n", __func__, ptr); + pr_debug("%s(0x%p)\n", __func__, ptr); if (!kmemleak_enabled || IS_ERR_OR_NULL(ptr)) return; @@ -1183,7 +1186,7 @@ EXPORT_SYMBOL(kmemleak_update_trace); */ void __ref kmemleak_not_leak(const void *ptr) { - pr_debug("%s(0x%px)\n", __func__, ptr); + pr_debug("%s(0x%p)\n", __func__, ptr); if (kmemleak_enabled && ptr && !IS_ERR(ptr)) make_gray_object((unsigned long)ptr); @@ -1201,7 +1204,7 @@ EXPORT_SYMBOL(kmemleak_not_leak); */ void __ref kmemleak_ignore(const void *ptr) { - pr_debug("%s(0x%px)\n", __func__, ptr); + pr_debug("%s(0x%p)\n", __func__, ptr); if (kmemleak_enabled && ptr && !IS_ERR(ptr)) make_black_object((unsigned long)ptr, false); @@ -1221,7 +1224,7 @@ EXPORT_SYMBOL(kmemleak_ignore); */ void __ref kmemleak_scan_area(const void *ptr, size_t size, gfp_t gfp) { - pr_debug("%s(0x%px)\n", __func__, ptr); + pr_debug("%s(0x%p)\n", __func__, ptr); if (kmemleak_enabled && ptr && size && !IS_ERR(ptr)) add_scan_area((unsigned long)ptr, size, gfp); @@ -1239,7 +1242,7 @@ EXPORT_SYMBOL(kmemleak_scan_area); */ void __ref kmemleak_no_scan(const void *ptr) { - pr_debug("%s(0x%px)\n", __func__, ptr); + pr_debug("%s(0x%p)\n", __func__, ptr); if (kmemleak_enabled && ptr && !IS_ERR(ptr)) object_no_scan((unsigned long)ptr); @@ -1255,7 +1258,7 @@ EXPORT_SYMBOL(kmemleak_no_scan); */ void __ref kmemleak_alloc_phys(phys_addr_t phys, size_t size, gfp_t gfp) { - pr_debug("%s(0x%px, %zu)\n", __func__, &phys, size); + pr_debug("%s(0x%p, %zu)\n", __func__, &phys, size); if (kmemleak_enabled) /* @@ -1275,7 +1278,7 @@ EXPORT_SYMBOL(kmemleak_alloc_phys); */ void __ref kmemleak_free_part_phys(phys_addr_t phys, size_t size) { - pr_debug("%s(0x%px)\n", __func__, &phys); + pr_debug("%s(0x%p)\n", __func__, &phys); if (kmemleak_enabled) delete_object_part((unsigned long)phys, size, true); @@ -1289,7 +1292,7 @@ EXPORT_SYMBOL(kmemleak_free_part_phys); */ void __ref kmemleak_ignore_phys(phys_addr_t phys) { - pr_debug("%s(0x%px)\n", __func__, &phys); + pr_debug("%s(0x%p)\n", __func__, &phys); if (kmemleak_enabled) make_black_object((unsigned long)phys, true); @@ -1662,6 +1665,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 +1772,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 +2018,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 +2135,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