From patchwork Thu Jul 12 21:53:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ernesto_A=2E_Fern=C3=A1ndez?= X-Patchwork-Id: 10522355 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D1F986028E for ; Thu, 12 Jul 2018 21:53:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BB9D7286E2 for ; Thu, 12 Jul 2018 21:53:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AF5B829965; Thu, 12 Jul 2018 21:53:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3BE4E286E2 for ; Thu, 12 Jul 2018 21:53:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726740AbeGLWFV (ORCPT ); Thu, 12 Jul 2018 18:05:21 -0400 Received: from mail-qt0-f194.google.com ([209.85.216.194]:40889 "EHLO mail-qt0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726710AbeGLWFV (ORCPT ); Thu, 12 Jul 2018 18:05:21 -0400 Received: by mail-qt0-f194.google.com with SMTP id h4-v6so25492309qtj.7 for ; Thu, 12 Jul 2018 14:53:51 -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:mime-version:content-disposition :content-transfer-encoding; bh=1IjU0F6aAJAx6jomYGV5UuWRW3Cn1XxAqLRNI9XSHNU=; b=HTSokGfj1crlCLT+LfLDGl8WE1BqZwVR4No76nvWTLOH8/1HKGIHS9rq/FqcfgXkRc 99/o6hZ9tE+uhkDg7+s9Suo8XDuQYarrf0YfipXhVDt8CO8KsSAs7ATGmInmoy64PP7V nS6SbM+ycZnzJBzfMoyEovOewLq8zxe8cXAfXeMH3yU2aaFD9qCEhcnuUhlYwahPze50 aQcFN8GY//ln4vKPAcmdA5Th35eETus4oxVhDs2oq69XzhS3aR5GA2/aAN9DBv6rqrE/ XnQ959x2/m54WMjBlsmEkdcj6RsQB4mP+wz2WNm8wAkIrYP57MMGAMK8TqRp6YUso2S3 0EhQ== 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:mime-version :content-disposition:content-transfer-encoding; bh=1IjU0F6aAJAx6jomYGV5UuWRW3Cn1XxAqLRNI9XSHNU=; b=XJoLB29KpzKBwi6Jm7RDquJ4sUVd8Phky8GZCY8GhV2S/HNKcR39JCZujhM2Qm0lJI XSD3pbpxBXxXBl5diNSkQI/4nubTdk6tim7yBQfSL0DEbkc7+hJUonnK5xyFCpsUA3jJ FGplNNbtsJweyEuTbmZZvYMzuwRBn6sZs46wHzZDFQdJSCh0vJwzYtpE93XR2WZL+0aR ExsnoaO2QdzX5RQZwhac8KZ4g8cJeIuDAg+1Amy3T/zMBbWyY7pu4/7iHutA+mo4MkxK sG1iYKLiq2Oudj7/dzZ8lMvstDQNEOXI4yPLojchlImOpKo7ginA3T0rKQPgJ2cCvgyM Tkzg== X-Gm-Message-State: AOUpUlGN2hrT4pj839rEVL96XhC7Y6PZAFRIzpbuFkV7ZcNvp8L6z1Ym EN+YNt9CRhkPLh/3brNR7fDJKg== X-Google-Smtp-Source: AAOMgpfKs7xcwpAVkgNoh7CPU00zvWNgCs/SCez9UTZuRIS8aidiEGtoGB4jY7kA8U2ZtQLHJNpQFQ== X-Received: by 2002:ac8:3094:: with SMTP id v20-v6mr3383562qta.313.1531432431243; Thu, 12 Jul 2018 14:53:51 -0700 (PDT) Received: from eaf ([181.47.179.0]) by smtp.gmail.com with ESMTPSA id l84-v6sm19412737qki.69.2018.07.12.14.53.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 12 Jul 2018 14:53:50 -0700 (PDT) Date: Thu, 12 Jul 2018 18:53:47 -0300 From: Ernesto =?utf-8?Q?A=2E_Fern=C3=A1ndez?= To: linux-fsdevel@vger.kernel.org Cc: Andrew Morton , "Xu, Wen" Subject: [PATCH] hfsplus: fix NULL dereference in hfsplus_lookup() Message-ID: <20180712215344.q44dyrhymm4ajkao@eaf> MIME-Version: 1.0 Content-Disposition: inline Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Check that the hidden directory is not NULL before using it, instead of after. Reported-by: Wen Xu Signed-off-by: Ernesto A. Fernández --- fs/hfsplus/dir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c index b5254378f011..cd017d7dbdfa 100644 --- a/fs/hfsplus/dir.c +++ b/fs/hfsplus/dir.c @@ -78,13 +78,13 @@ static struct dentry *hfsplus_lookup(struct inode *dir, struct dentry *dentry, cpu_to_be32(HFSP_HARDLINK_TYPE) && entry.file.user_info.fdCreator == cpu_to_be32(HFSP_HFSPLUS_CREATOR) && + HFSPLUS_SB(sb)->hidden_dir && (entry.file.create_date == HFSPLUS_I(HFSPLUS_SB(sb)->hidden_dir)-> create_date || entry.file.create_date == HFSPLUS_I(d_inode(sb->s_root))-> - create_date) && - HFSPLUS_SB(sb)->hidden_dir) { + create_date)) { struct qstr str; char name[32];