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 X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 219CBC76195 for ; Fri, 19 Jul 2019 04:06:46 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id DD32A218A3 for ; Fri, 19 Jul 2019 04:06:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="v0c4jtxj" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DD32A218A3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 8197B8E0009; Fri, 19 Jul 2019 00:06:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7A2648E0001; Fri, 19 Jul 2019 00:06:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 66AC98E0009; Fri, 19 Jul 2019 00:06:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by kanga.kvack.org (Postfix) with ESMTP id 2E5BE8E0001 for ; Fri, 19 Jul 2019 00:06:45 -0400 (EDT) Received: by mail-pf1-f197.google.com with SMTP id h27so17891223pfq.17 for ; Thu, 18 Jul 2019 21:06:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Kx3qgha4ofJZpZgk8zklJXfSD9AM0sSJFMz4pmoEAhE=; b=WP5Su3UZuLQlW+GGp/buDnNtcYupjfAGFDaaAe24xCPkn5cnnKEhEi9JYQ+B3VNoZn 96k5w508PX46xO9PKNIZir80Z3/ln97IuC9P7u9fbMPJ2/jbpOK6KIK9sXqEgB7YTYOa WXBdSDlGKHN8iE2jAdg/zxOpBpQBCREV/mfvSSZWhUGJxVn5y92vugAtlrrsPQiSYlZx FC3A5hAS41ZSP1F1ALhA7YMt9ZZ3+m87lRBKAsZMg2vYZXGzV7SLDP0PtQHiZ56dAdKi FAIQC530nw4Pp6faH4XhN/OBtjsm3WKFcixjl6k+/Rt7SfOxeqAVOatiZm89iDQWl+H/ Pj2Q== X-Gm-Message-State: APjAAAUEDxnWFKziWrAAC7RiTy/ft00dLNekQcbZ4Vv6WdG7R2SzzF92 x53ceCxMwNFZp21YPa0jYUXh1QvPJq096cvvc0O4uVDDeklQmqoTH2FljgQEutJh4EV4EIAwZ+J 25kOOJ9ELLlTWkXyvsav7o3WRiDFzWPjpAw+PJWWUHwKltB91J5b540fSp+7dE9C0mA== X-Received: by 2002:a63:c118:: with SMTP id w24mr49121383pgf.347.1563509204789; Thu, 18 Jul 2019 21:06:44 -0700 (PDT) X-Google-Smtp-Source: APXvYqy2Z9zNp53sRdQD77vLlPw6TsHG1EO916P8oY+nO17zzvpuzbfmqxKLHEPoKHSC2mG3kwGA X-Received: by 2002:a63:c118:: with SMTP id w24mr49121316pgf.347.1563509203969; Thu, 18 Jul 2019 21:06:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563509203; cv=none; d=google.com; s=arc-20160816; b=NDlX0WX7Yoe5RZxfe3NjmPHdysl1AyG5EmoLiKUWnka+pnnmzIBjnHhjOJwwr4EzO6 1NRzvwH7UUizIhgATEDUEboBb5V4kHoCX+grnPGAX1edLxq8D88wDjNevGZp6j3sHSTG LzEqe6RgZJH1Zt23HlSzutcMTea+HVFiK4jd0Jjy+7RPi3cu5opsPxRwbQ3SLmBsjlEY //SiCwnmCKev3rHw2bQAqWMrMvzshNHmsy8crnahf9d9FSbgrunFHfBoq8whrQ+Sj9cw OWrnDX/4hMLm7CCPOPSHRNyoBMHuH2kJQjRtU0mNUN/NOo/lzbl6OPtEq2yj1PLADIV2 44bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=Kx3qgha4ofJZpZgk8zklJXfSD9AM0sSJFMz4pmoEAhE=; b=CbKVdN9hfMDqHafy6+Xy4VmAtbCj2L12FDlC7fgGI6CQEFy5N/KsP7Jzo38WWr9wca EggcmzR3M0w+yCo2O6ZRDT3ilgaJvsKrQ4xD4EOdJ04b66wy/yz2Pvi6BkKIPJZk0V3/ GV1CGfrMTTi0valQdXfrltp0BV3RnErpRdgq0i/6Wnnr8AymrT+z44Yb8eAN/KrXdtSB 0/h6HweCaes83RLGWgt6ZTdrsT+4OQAcmXMWMI2TEP0qIOVAvVuzL1symwq56/1vqQiS 7dAxHXG8G9JJj5e8h4dccGv0P3G8k2U4rts0ff5esY9+5v1mhCmR13dMCe0qAbqA0tG2 /glA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=v0c4jtxj; spf=pass (google.com: domain of sashal@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=sashal@kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from mail.kernel.org (mail.kernel.org. [198.145.29.99]) by mx.google.com with ESMTPS id m184si204729pgm.580.2019.07.18.21.06.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jul 2019 21:06:43 -0700 (PDT) Received-SPF: pass (google.com: domain of sashal@kernel.org designates 198.145.29.99 as permitted sender) client-ip=198.145.29.99; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=v0c4jtxj; spf=pass (google.com: domain of sashal@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=sashal@kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C87B4218B8; Fri, 19 Jul 2019 04:06:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563509203; bh=8cpGC+iBiGLaSAVkSHn/d/SddZ2kdM1Tv1ZZls54Fzs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=v0c4jtxjSywBLHa9nh0sGVeCJvYBl6JhaKs/rpwHUd+GIQZ0/R89hBWl5tFzx5cM+ PPLdrsnnDOBeETtJMhv26gymkRI7jT65QUYgAnfKG+5KrfiTLlOfMBPIKBsnLTmMIh huxfxZehYnWzMCnBMJn7BxrE3T2ZZQ7ifTUi/nAY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dmitry Vyukov , Catalin Marinas , Andrew Morton , Linus Torvalds , Sasha Levin , linux-mm@kvack.org Subject: [PATCH AUTOSEL 5.1 126/141] mm/kmemleak.c: fix check for softirq context Date: Fri, 19 Jul 2019 00:02:31 -0400 Message-Id: <20190719040246.15945-126-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190719040246.15945-1-sashal@kernel.org> References: <20190719040246.15945-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit 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: From: Dmitry Vyukov [ Upstream commit 6ef9056952532c3b746de46aa10d45b4d7797bd8 ] in_softirq() is a wrong predicate to check if we are in a softirq context. It also returns true if we have BH disabled, so objects are falsely stamped with "softirq" comm. The correct predicate is in_serving_softirq(). If user does cat from /sys/kernel/debug/kmemleak previously they would see this, which is clearly wrong, this is system call context (see the comm): unreferenced object 0xffff88805bd661c0 (size 64): comm "softirq", pid 0, jiffies 4294942959 (age 12.400s) hex dump (first 32 bytes): 00 00 00 00 00 00 00 00 ff ff ff ff 00 00 00 00 ................ 00 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 ................ backtrace: [<0000000007dcb30c>] kmemleak_alloc_recursive include/linux/kmemleak.h:55 [inline] [<0000000007dcb30c>] slab_post_alloc_hook mm/slab.h:439 [inline] [<0000000007dcb30c>] slab_alloc mm/slab.c:3326 [inline] [<0000000007dcb30c>] kmem_cache_alloc_trace+0x13d/0x280 mm/slab.c:3553 [<00000000969722b7>] kmalloc include/linux/slab.h:547 [inline] [<00000000969722b7>] kzalloc include/linux/slab.h:742 [inline] [<00000000969722b7>] ip_mc_add1_src net/ipv4/igmp.c:1961 [inline] [<00000000969722b7>] ip_mc_add_src+0x36b/0x400 net/ipv4/igmp.c:2085 [<00000000a4134b5f>] ip_mc_msfilter+0x22d/0x310 net/ipv4/igmp.c:2475 [<00000000d20248ad>] do_ip_setsockopt.isra.0+0x19fe/0x1c00 net/ipv4/ip_sockglue.c:957 [<000000003d367be7>] ip_setsockopt+0x3b/0xb0 net/ipv4/ip_sockglue.c:1246 [<000000003c7c76af>] udp_setsockopt+0x4e/0x90 net/ipv4/udp.c:2616 [<000000000c1aeb23>] sock_common_setsockopt+0x3e/0x50 net/core/sock.c:3130 [<000000000157b92b>] __sys_setsockopt+0x9e/0x120 net/socket.c:2078 [<00000000a9f3d058>] __do_sys_setsockopt net/socket.c:2089 [inline] [<00000000a9f3d058>] __se_sys_setsockopt net/socket.c:2086 [inline] [<00000000a9f3d058>] __x64_sys_setsockopt+0x26/0x30 net/socket.c:2086 [<000000001b8da885>] do_syscall_64+0x7c/0x1a0 arch/x86/entry/common.c:301 [<00000000ba770c62>] entry_SYSCALL_64_after_hwframe+0x44/0xa9 now they will see this: unreferenced object 0xffff88805413c800 (size 64): comm "syz-executor.4", pid 8960, jiffies 4294994003 (age 14.350s) hex dump (first 32 bytes): 00 7a 8a 57 80 88 ff ff e0 00 00 01 00 00 00 00 .z.W............ 00 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 ................ backtrace: [<00000000c5d3be64>] kmemleak_alloc_recursive include/linux/kmemleak.h:55 [inline] [<00000000c5d3be64>] slab_post_alloc_hook mm/slab.h:439 [inline] [<00000000c5d3be64>] slab_alloc mm/slab.c:3326 [inline] [<00000000c5d3be64>] kmem_cache_alloc_trace+0x13d/0x280 mm/slab.c:3553 [<0000000023865be2>] kmalloc include/linux/slab.h:547 [inline] [<0000000023865be2>] kzalloc include/linux/slab.h:742 [inline] [<0000000023865be2>] ip_mc_add1_src net/ipv4/igmp.c:1961 [inline] [<0000000023865be2>] ip_mc_add_src+0x36b/0x400 net/ipv4/igmp.c:2085 [<000000003029a9d4>] ip_mc_msfilter+0x22d/0x310 net/ipv4/igmp.c:2475 [<00000000ccd0a87c>] do_ip_setsockopt.isra.0+0x19fe/0x1c00 net/ipv4/ip_sockglue.c:957 [<00000000a85a3785>] ip_setsockopt+0x3b/0xb0 net/ipv4/ip_sockglue.c:1246 [<00000000ec13c18d>] udp_setsockopt+0x4e/0x90 net/ipv4/udp.c:2616 [<0000000052d748e3>] sock_common_setsockopt+0x3e/0x50 net/core/sock.c:3130 [<00000000512f1014>] __sys_setsockopt+0x9e/0x120 net/socket.c:2078 [<00000000181758bc>] __do_sys_setsockopt net/socket.c:2089 [inline] [<00000000181758bc>] __se_sys_setsockopt net/socket.c:2086 [inline] [<00000000181758bc>] __x64_sys_setsockopt+0x26/0x30 net/socket.c:2086 [<00000000d4b73623>] do_syscall_64+0x7c/0x1a0 arch/x86/entry/common.c:301 [<00000000c1098bec>] entry_SYSCALL_64_after_hwframe+0x44/0xa9 Link: http://lkml.kernel.org/r/20190517171507.96046-1-dvyukov@gmail.com Signed-off-by: Dmitry Vyukov Acked-by: Catalin Marinas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- mm/kmemleak.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/kmemleak.c b/mm/kmemleak.c index 2e435b8142e5..accd01cda97b 100644 --- a/mm/kmemleak.c +++ b/mm/kmemleak.c @@ -601,7 +601,7 @@ static struct kmemleak_object *create_object(unsigned long ptr, size_t size, if (in_irq()) { object->pid = 0; strncpy(object->comm, "hardirq", sizeof(object->comm)); - } else if (in_softirq()) { + } else if (in_serving_softirq()) { object->pid = 0; strncpy(object->comm, "softirq", sizeof(object->comm)); } else { -- 2.20.1