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=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 63315C4338F for ; Tue, 24 Aug 2021 09:35:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 30C8D60EE0 for ; Tue, 24 Aug 2021 09:35:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235652AbhHXJgE (ORCPT ); Tue, 24 Aug 2021 05:36:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36828 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235566AbhHXJgD (ORCPT ); Tue, 24 Aug 2021 05:36:03 -0400 Received: from mail-lj1-x234.google.com (mail-lj1-x234.google.com [IPv6:2a00:1450:4864:20::234]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AAFB8C061757; Tue, 24 Aug 2021 02:35:19 -0700 (PDT) Received: by mail-lj1-x234.google.com with SMTP id l18so28927829lji.12; Tue, 24 Aug 2021 02:35:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=MmMhw6hROY3UzAV5o6RuiQFgaemmAxgh/96X2CQo2p0=; b=OQovTaJzsP9RahK2KO4x5Hefqo54kQDyYVye/WWELIihCRUF580Z6cU4UPvjDfOPJ0 9IEzi0QV1B0CHtdpRj+zZ5CVEk6OX8+ESC05CVlwG+tUAw35JcSkdVvRjCaUEHtkPATz 24auOcJvK2ofqgnoSnFR7nnYTS6zZKEomLIFWdGjqqbo25RESH7FacTODqvkN+L0id1u DPLxqXnJB8Isk43vpdGwZK3aFVnpKZz5oS5N91vJLKuEUxQOGuHlhTAHooGEJekqehl6 NCcrq6jj2YX3Oj+WL1n+ZSfRNE6EEXBvRUn0gvDoLkDqudTq2LGjOs9YUhz4GJsTTSXo Ee5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=MmMhw6hROY3UzAV5o6RuiQFgaemmAxgh/96X2CQo2p0=; b=cQ7d6e4Z16eiQlYnI/X3Mrcnah66ziIPr4AM7S/OzEnrXkVqdfAZKytKmo3CnFz9KW K0cBE0iGM+3IeplxZHMuU+9IoOb0GfiK7dstO/UreyRPjPKjUUgEd5BujK9RzcX+Ggj/ auj5yWgfhAzvQMekrnhIGmbYJ+GfzfLbr9AeVWY1TGfyE2wnw+bdcaFV3++IXxq5hwL9 8cr0dYddf1vj3b5V4CpcNUpPe9iIoIVcAKGvtQPSkAsTEda2GH308VLNmYMw/dVSmUlF 8b9izkeeCXNPhZ49YFvrDYbANXgk3aZaWLJV2236thLtYFgWu6UTTDE0Oc0Q8ulyuqsk rK5g== X-Gm-Message-State: AOAM532kmPxrxR8shdEEMEvVewY5MK/6FQMuDfxT4HVmVBzHibWy0slc VcRLIO8gRRCjs15WZQpDzM4= X-Google-Smtp-Source: ABdhPJzM2MKLihPUUxfOlMhNkKUV9K/F6645o+RoARAy8xavph6WCiaNYJuJFy1KPlH19Kwo/UDJSg== X-Received: by 2002:a2e:9852:: with SMTP id e18mr30477309ljj.173.1629797717627; Tue, 24 Aug 2021 02:35:17 -0700 (PDT) Received: from kari-VirtualBox (85-23-89-224.bb.dnainternet.fi. [85.23.89.224]) by smtp.gmail.com with ESMTPSA id w26sm1704184lfk.223.2021.08.24.02.35.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Aug 2021 02:35:17 -0700 (PDT) Date: Tue, 24 Aug 2021 12:35:15 +0300 From: Kari Argillander To: Dan Carpenter Cc: Konstantin Komarov , ntfs3@lists.linux.dev, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: Re: [PATCH 2/3] fs/ntfs3: Potential NULL dereference in hdr_find_split() Message-ID: <20210824093515.f3kvy4extj76gkjn@kari-VirtualBox> References: <20210824074932.GA13096@kili> <20210824075015.GB13096@kili> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210824075015.GB13096@kili> Precedence: bulk List-ID: X-Mailing-List: kernel-janitors@vger.kernel.org On Tue, Aug 24, 2021 at 10:50:15AM +0300, Dan Carpenter wrote: > The "e" pointer is dereferenced before it has been checked for NULL. > Move the dereference after the NULL check to prevent an Oops. > > Fixes: 82cae269cfa9 ("fs/ntfs3: Add initialization of super block") > Signed-off-by: Dan Carpenter Reviewed-by: Kari Argillander > --- > fs/ntfs3/index.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/fs/ntfs3/index.c b/fs/ntfs3/index.c > index 07d6dee0a4ba..489e0fffbc75 100644 > --- a/fs/ntfs3/index.c > +++ b/fs/ntfs3/index.c > @@ -556,11 +556,12 @@ static const struct NTFS_DE *hdr_find_split(const struct INDEX_HDR *hdr) > size_t o; > const struct NTFS_DE *e = hdr_first_de(hdr); > u32 used_2 = le32_to_cpu(hdr->used) >> 1; > - u16 esize = le16_to_cpu(e->size); > + u16 esize; > > if (!e || de_is_last(e)) > return NULL; > > + esize = le16_to_cpu(e->size); > for (o = le32_to_cpu(hdr->de_off) + esize; o < used_2; o += esize) { > const struct NTFS_DE *p = e;