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=-17.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL 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 293F8C2D0C8 for ; Fri, 20 Dec 2019 18:50:07 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D5D26206DA for ; Fri, 20 Dec 2019 18:50:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="szmGc2+v" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D5D26206DA Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 822CB8E01A4; Fri, 20 Dec 2019 13:50:06 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7F9148E019D; Fri, 20 Dec 2019 13:50:06 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 70ED68E01A4; Fri, 20 Dec 2019 13:50:06 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0045.hostedemail.com [216.40.44.45]) by kanga.kvack.org (Postfix) with ESMTP id 5A2E38E019D for ; Fri, 20 Dec 2019 13:50:06 -0500 (EST) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with SMTP id 159FD181AEF15 for ; Fri, 20 Dec 2019 18:50:06 +0000 (UTC) X-FDA: 76286409612.21.word86_753adee835936 X-HE-Tag: word86_753adee835936 X-Filterd-Recvd-Size: 5064 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.74]) by imf27.hostedemail.com (Postfix) with ESMTP for ; Fri, 20 Dec 2019 18:50:05 +0000 (UTC) Received: by mail-wr1-f74.google.com with SMTP id b13so4111827wrx.22 for ; Fri, 20 Dec 2019 10:50:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=/hMZ8glOhS62Vt3LZE/bPEfxesFxBGf3L6g6lEVYXug=; b=szmGc2+vLpa6iLloUQhE2WKW6HwfIxjlmVTWW1De7lsGhX6FqEej+vJIjvS03njmBE V1tcViuj+r4hxF1yk27C9uKBm0JMRs2uw+DGCjnvM1joioeHHpfawk7vlkCJpy2hDvtf LB/h0uriSah2QR97iHs5XpNvh+lh7uAfAa0bqpcivuaWD7FY8yl/HUyCmDTjcEeGj4B3 2WBdz5yWKN5ZUz8EhlDUmCEkqF2yenes55ExEiPUrdRGOD7MSPdGMl0Ls3GQu0cf2vAk 3obCXWtbrVho/FoieqOM0HPu2w9BDQnfLf7ris7h1/VfmCaVHlxna7IZZIedNjR5rIy2 RoMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=/hMZ8glOhS62Vt3LZE/bPEfxesFxBGf3L6g6lEVYXug=; b=bzC3EzA4m8WAQclA8cSQwqGPuk/R4VwnxmpwfJ4RYB3bD31SKifQ8wCz6dT434uC01 z6NT8uX1Kt1m/KcI7f1tCjeC7ZiZNMbw9gVsPJHDHnWcTIQ+J0yPshjS5qUWDYWNFv9U d/CAyIHAEkkqH0Hg6PrrB3dlgnvDUaQSA3S7k2IFwmQJ17LOqkZn8w7X63newCOr177h i2HfV+uIYwPDLMYTX7AcTNMqnI3AnxwXx4XautloLsKkFa8CN79xPvJfCbdXOvqTRNf3 aa2Kbga/THcN28JueR8n5k2cIaKxqnOVtr2Jv7pyn/DDYDiwgvkpHSTuaXupY4i+xNuF 2vgA== X-Gm-Message-State: APjAAAVi5lj92MO9tvSZLGKTOR9p47O5bborbnBU3IT1xy9+eH6EPaIg UKFlfDVXHULqz9UVUYq3i5psw0PMn3g= X-Google-Smtp-Source: APXvYqxnO2B0EjIk7fwu/ajgHJgCQRHIfKGoNIyL8C826ezQJW5D1kkm6ZUDFKzQwBof5QAqKSplz77Mgxs= X-Received: by 2002:adf:f2d0:: with SMTP id d16mr16163272wrp.110.1576867803757; Fri, 20 Dec 2019 10:50:03 -0800 (PST) Date: Fri, 20 Dec 2019 19:49:14 +0100 In-Reply-To: <20191220184955.223741-1-glider@google.com> Message-Id: <20191220184955.223741-2-glider@google.com> Mime-Version: 1.0 References: <20191220184955.223741-1-glider@google.com> X-Mailer: git-send-email 2.24.1.735.g03f4e72817-goog Subject: [PATCH RFC v4 01/42] stackdepot: check depot_index before accessing the stack slab From: glider@google.com To: Vegard Nossum , Dmitry Vyukov , Marco Elver , Andrey Konovalov , linux-mm@kvack.org Cc: glider@google.com, viro@zeniv.linux.org.uk, adilger.kernel@dilger.ca, akpm@linux-foundation.org, aryabinin@virtuozzo.com, luto@kernel.org, ard.biesheuvel@linaro.org, arnd@arndb.de, hch@infradead.org, hch@lst.de, darrick.wong@oracle.com, davem@davemloft.net, dmitry.torokhov@gmail.com, ebiggers@google.com, edumazet@google.com, ericvh@gmail.com, gregkh@linuxfoundation.org, harry.wentland@amd.com, herbert@gondor.apana.org.au, iii@linux.ibm.com, mingo@elte.hu, jasowang@redhat.com, axboe@kernel.dk, m.szyprowski@samsung.com, mark.rutland@arm.com, martin.petersen@oracle.com, schwidefsky@de.ibm.com, willy@infradead.org, mst@redhat.com, mhocko@suse.com, monstr@monstr.eu, pmladek@suse.com, cai@lca.pw, rdunlap@infradead.org, robin.murphy@arm.com, sergey.senozhatsky@gmail.com, rostedt@goodmis.org, tiwai@suse.com, tytso@mit.edu, tglx@linutronix.de, gor@linux.ibm.com, wsa@the-dreams.de Content-Type: text/plain; charset="UTF-8" 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: Avoid crashes on corrupted stack ids. Signed-off-by: Alexander Potapenko To: Alexander Potapenko Cc: Vegard Nossum Cc: Dmitry Vyukov Cc: Marco Elver Cc: Andrey Konovalov Cc: linux-mm@kvack.org --- v3: - fix the return statement v4: - nullify |entries| if stack is not found Change-Id: I0a0b38ed5057090696a2c6ff0be7cfcc24ae6738 --- lib/stackdepot.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/lib/stackdepot.c b/lib/stackdepot.c index ed717dd08ff3..1d3aab244897 100644 --- a/lib/stackdepot.c +++ b/lib/stackdepot.c @@ -198,9 +198,22 @@ unsigned int stack_depot_fetch(depot_stack_handle_t handle, unsigned long **entries) { union handle_parts parts = { .handle = handle }; - void *slab = stack_slabs[parts.slabindex]; + void *slab; size_t offset = parts.offset << STACK_ALLOC_ALIGN; - struct stack_record *stack = slab + offset; + struct stack_record *stack; + + if (parts.slabindex > depot_index) { + WARN(1, "slab index %d out of bounds (%d) for stack id %08x\n", + parts.slabindex, depot_index, handle); + *entries = NULL; + return 0; + } + slab = stack_slabs[parts.slabindex]; + stack = slab + offset; + if (!stack) { + *entries = NULL; + return 0; + } *entries = stack->entries; return stack->size; -- 2.24.1.735.g03f4e72817-goog