From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AAA2A2E9EBE for ; Thu, 9 Oct 2025 10:58:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.175 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760007485; cv=none; b=n60AX8os9QjwLvEMiR7bV+rfwTKfCfiYLLZuOCQihpla8g9WsqIBF9FZvBylkbWyhbe6ixITstS8sFGdJK4cdZx7SaG/QAC7UL4bljxgy4PWiHfB4NskZcoIl3DUiVJVkyEZgpPvnfGXo5YDzNULvmNB202njmV60HpUDFCVGmA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760007485; c=relaxed/simple; bh=ye1IFedT6QyfAsl7NnFp/ScKqi80nwnk9udpC+1GQaI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ISnSWqdS0OpPUC9YjN6wAbhV7QLC5g4bwET4bmzS/ybfwFbhEAz+3s2XFmrckAauzI+fKNEmOxEJRR4tbI3WuPDihGJbW20M1OoqOtCZotyMO01CVPyJ1Z7NSP4HGUsx4MUCpwcDjshKZxfKEqGEMmgdu1wkF70a2wDLeaVTUic= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ODsOicmc; arc=none smtp.client-ip=209.85.210.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ODsOicmc" Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-781010ff051so593461b3a.0 for ; Thu, 09 Oct 2025 03:58:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760007483; x=1760612283; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1RtyZdLa/V9peD4vyIt7vF3g+yVd+tHG9wNYuCcZNH8=; b=ODsOicmcpogZIjUzSZgC/Qb3neikMeAL+1pmPBl7hJ3pqFKfaInwNFAXfvjaNloauh xzOZghH4g6vexCsLv700Jx8JQcMR7HB6zMP4XfUzI8YvJzjk5mnBDjGAn14rE4qT2qmO Wfq4KGslflEQGkSHe1JTv97IDQnx1iITy23Dv9/fFwBij5pB0IYBM1F3P/18QYoJ6MBZ EMICXVbw+381Wv5PYy4CXh7ZRafYUrCEMYK3PYtiYrnoXE682UqP3urTrG3pqnOBOjcw 9rWhwT5n781Y28hDIjGBp/mt03veW9zuBdnqvG/f+jzxe/fE//GMZYDEyjo+ckkwp4K4 QHSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760007483; x=1760612283; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1RtyZdLa/V9peD4vyIt7vF3g+yVd+tHG9wNYuCcZNH8=; b=mzyGB3uiyxlP3PXNOILcD78gr5yxbEYbiCoIlJuthshBtBKU+qMWMTQdpttUSw3Tse g+KTqqJ43QKIKdFS3D2FQfDevHWsSBQ9DrNjwZwgBa5H/hmQPGzYw7gyNGYAcnxOpOUM DCDYVFj8l4vddTxcel1ElJ3v1a/BwBD7rYmTNAIArJlQJ+oflgZm4crLkUaciEwxxgEy pEL4WBRfy1MNBuVJzxJ2WdQraFpzHmjOUkAD19/Yzbs0KfapxxLz/IanBxeaBeGNhNnV YWxzbET7FSTGMkYGJJ+OSCXbMnLwo+ABDVZ4jYhYS3ZvbtRaRh2C77zpoRoyZXbz9W5K cBAw== X-Forwarded-Encrypted: i=1; AJvYcCU63FIGcshJHO+PmIWehZNSYv/WV1IIUdv25MUcPLpa2lbjTCaTiQ6WtTKydHuh7NLBsSro@lists.linux.dev X-Gm-Message-State: AOJu0YzynMFRrR5ocvr5XDY0lkCAB4TdWUgUcNS2n5zkOO2gXGQSiTUL S/f7lSIs0tex2eSA4+RdqeUBnIK3wG3kW7DXYoH0Zdzl+DpfmGvZj7vq X-Gm-Gg: ASbGnctmoneMhyJhKuapm5G38y4c10MnirJ7phK7VFeXhuL95eZOBD2au2hkA1s2NRW vKhxf73/K/typwYxjYufMDKPN/NwWM0ls8u0k6uMTJ9Zue6BdWssSI/cToBfOY+HztHEnu+5tpv zbBc99Xn5J4jZHT7p2j2BTTmbzzcVRG0NGU+36Jc6yHBp1LXKQcNUj/rqwl4gbXYhY5L7uAYzGt F5yQqOf3jgMubKIAVANtOabjcF4XVeEcomV5uozvxrbG63W4sWr3/HDdyqZEomngX0H42Jheu0w Z1HfxIgzK3mBo1tWk+UPiP5AZmYLZ7OrxqBbz9hb+wEvRwSLO2oxXMtVLB7uL8xCx6h9u59wACr UNLr+22A3r+gMb/I0ipwioMAl0OW8f1h/T5vXKV8R/tWyzcpihZ0GubKFrVRPYCJq8+Jj778= X-Google-Smtp-Source: AGHT+IGV1mxHWu3pQaxCo2GAVbKHGeNdLDqI1po/b05L3G5Ejn51+25jeUHtC8qpbOYN5GwS7DtIXA== X-Received: by 2002:a05:6a20:12cd:b0:2f8:4558:ad9e with SMTP id adf61e73a8af0-32da839ee26mr9375118637.33.1760007482826; Thu, 09 Oct 2025 03:58:02 -0700 (PDT) Received: from localhost ([45.142.165.62]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b6099f3b041sm20711876a12.24.2025.10.09.03.58.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Oct 2025 03:58:02 -0700 (PDT) From: Jinchao Wang To: Andrew Morton , Masami Hiramatsu , Peter Zijlstra , Mike Rapoport , Alexander Potapenko , Randy Dunlap , Marco Elver , Jonathan Corbet , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , "Liang, Kan" , David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Suren Baghdasaryan , Michal Hocko , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Kees Cook , Alice Ryhl , Sami Tolvanen , Miguel Ojeda , Masahiro Yamada , Rong Xu , Naveen N Rao , David Kaplan , Andrii Nakryiko , Jinjie Ruan , Nam Cao , workflows@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-mm@kvack.org, llvm@lists.linux.dev, Andrey Ryabinin , Andrey Konovalov , Dmitry Vyukov , Vincenzo Frascino , kasan-dev@googlegroups.com, "David S. Miller" , Mathieu Desnoyers , linux-trace-kernel@vger.kernel.org Cc: Jinchao Wang Subject: [PATCH v7 14/23] mm/ksw: resolve stack watch addr and len Date: Thu, 9 Oct 2025 18:55:50 +0800 Message-ID: <20251009105650.168917-15-wangjinchao600@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251009105650.168917-1-wangjinchao600@gmail.com> References: <20251009105650.168917-1-wangjinchao600@gmail.com> Precedence: bulk X-Mailing-List: llvm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Add helpers to find the stack canary or a local variable addr and len for the probed function based on ksw_get_config(). For canary search, limits search to a fixed number of steps to avoid scanning the entire stack. Validates that the computed address and length are within the kernel stack. Signed-off-by: Jinchao Wang --- mm/kstackwatch/stack.c | 77 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 74 insertions(+), 3 deletions(-) diff --git a/mm/kstackwatch/stack.c b/mm/kstackwatch/stack.c index e596ef97222d..3c4cb6d5b58a 100644 --- a/mm/kstackwatch/stack.c +++ b/mm/kstackwatch/stack.c @@ -9,6 +9,7 @@ #include "kstackwatch.h" +#define MAX_CANARY_SEARCH_STEPS 128 static struct kprobe entry_probe; static struct fprobe exit_probe; @@ -59,13 +60,83 @@ static bool ksw_stack_check_ctx(bool entry) return false; } +static unsigned long ksw_find_stack_canary_addr(struct pt_regs *regs) +{ + unsigned long *stack_ptr, *stack_end, *stack_base; + unsigned long expected_canary; + unsigned int i; + + stack_ptr = (unsigned long *)kernel_stack_pointer(regs); + + stack_base = (unsigned long *)(current->stack); + + // TODO: limit it to the current frame + stack_end = (unsigned long *)((char *)current->stack + THREAD_SIZE); + + expected_canary = current->stack_canary; + + if (stack_ptr < stack_base || stack_ptr >= stack_end) { + pr_err("Stack pointer 0x%lx out of bounds [0x%lx, 0x%lx)\n", + (unsigned long)stack_ptr, (unsigned long)stack_base, + (unsigned long)stack_end); + return 0; + } + + for (i = 0; i < MAX_CANARY_SEARCH_STEPS; i++) { + if (&stack_ptr[i] >= stack_end) + break; + + if (stack_ptr[i] == expected_canary) { + pr_debug("canary found i:%d 0x%lx\n", i, + (unsigned long)&stack_ptr[i]); + return (unsigned long)&stack_ptr[i]; + } + } + + pr_debug("canary not found in first %d steps\n", + MAX_CANARY_SEARCH_STEPS); + return 0; +} + +static int ksw_stack_validate_addr(unsigned long addr, size_t size) +{ + unsigned long stack_start, stack_end; + + if (!addr || !size) + return -EINVAL; + + stack_start = (unsigned long)current->stack; + stack_end = stack_start + THREAD_SIZE; + + if (addr < stack_start || (addr + size) > stack_end) + return -ERANGE; + + return 0; +} + static int ksw_stack_prepare_watch(struct pt_regs *regs, const struct ksw_config *config, ulong *watch_addr, u16 *watch_len) { - /* implement logic will be added in following patches */ - *watch_addr = 0; - *watch_len = 0; + ulong addr; + u16 len; + + // default is to watch the canary + if (!ksw_get_config()->watch_len) { + addr = ksw_find_stack_canary_addr(regs); + len = sizeof(ulong); + } else { + addr = kernel_stack_pointer(regs) + ksw_get_config()->sp_offset; + len = ksw_get_config()->watch_len; + } + + if (ksw_stack_validate_addr(addr, len)) { + pr_err("invalid stack addr:0x%lx len :%u\n", addr, len); + return -EINVAL; + } + + *watch_addr = addr; + *watch_len = len; return 0; } -- 2.43.0