From patchwork Fri Mar 15 07:42:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kangjie Lu X-Patchwork-Id: 10854199 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1157515AC for ; Fri, 15 Mar 2019 07:43:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EE9572A891 for ; Fri, 15 Mar 2019 07:43:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DFAB22A893; Fri, 15 Mar 2019 07:43:00 +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,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 824682A891 for ; Fri, 15 Mar 2019 07:43:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727743AbfCOHmz (ORCPT ); Fri, 15 Mar 2019 03:42:55 -0400 Received: from mta-p7.oit.umn.edu ([134.84.196.207]:35496 "EHLO mta-p7.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727647AbfCOHmy (ORCPT ); Fri, 15 Mar 2019 03:42:54 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-p7.oit.umn.edu (Postfix) with ESMTP id 5C275D1C for ; Fri, 15 Mar 2019 07:42:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p7.oit.umn.edu ([127.0.0.1]) by localhost (mta-p7.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ckVsjmT3V7Wv for ; Fri, 15 Mar 2019 02:42:53 -0500 (CDT) Received: from mail-io1-f70.google.com (mail-io1-f70.google.com [209.85.166.70]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p7.oit.umn.edu (Postfix) with ESMTPS id 25B8FD1B for ; Fri, 15 Mar 2019 02:42:53 -0500 (CDT) Received: by mail-io1-f70.google.com with SMTP id i24so6303515iol.21 for ; Fri, 15 Mar 2019 00:42:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id; bh=o2ADGufCuxIAT4soQw3JMLB7pYqNLiLeR85PAz0yM0E=; b=lqTAy0mscZgZFcHHHMJwTfpsWitHRTru4MSKjRTaiSa3NoDq9+/J7vSv7vG5UBLFI1 0pzryCtiE2imLPydQuQnZRK8/nxaGYAqPZLeklHABquDHodYff5CWPoJiiKHHHU/bvZ8 q4xglO3g8zCimPz5rj7gIiQ0zpgnuNAc7Bp2vPWynP+arOW4WhtzEQBVp9aW7u4YtByL HElbYs/wlF++k1V4qRLrgFLvnLoaDWbwJHI4peB9BWBzCQ/3+iPHukBPwd33TlpMpC1Y s71Jirwb6OZR2gOVEhNVcEs0DfA0xiNlnDjT3k1SGTNFpuB5MnCjclFE1s+ZnX2PYNIt 2ImA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=o2ADGufCuxIAT4soQw3JMLB7pYqNLiLeR85PAz0yM0E=; b=mCX5ESMi/I7OQ1mjIawPdOOUlDcBqvTGqSo/dbRyYHbWRjtGw/5WON/FYSLL36s5Iv 7zoTxARI1qY/7i0fki6yn8/u7MFdU/OhAZ2nO/8ZXrpTRNPnN36ayEuyhzvJLiA8zA1k OlFpIJbjtnI3voILLsCz1lhj6z27OYQlO+Y6zgMatTkQ/3xbLy5/ndavSkwwYcnnMGN0 dS+sRWSIKwldVk1rIVlmt9OtiGj+84RTh61VTOUfISMkjQjz7+BhaxicIehFuWUQkKjc H8+aKf8yc/SG3Eij1FIDzh5jBTaqt1v8RnxzEpZo2OuJhSnDfNywSq95fxfPHNTmAj+T 1eig== X-Gm-Message-State: APjAAAXols7M62rVX8yiKQaxAPvSHdZ12WOtCGzR3ZDw7jcR0s1G/iBL WgWXckPQvvaHs9XAFg/ZqBMLTwGndCLbcX6LEh6Rkh1vyTNAw/96Uxw5ouBBkVQkBhltqtUbo6B O1/dxhFLdjSdReVbjBQIBQp+P0rOIKw== X-Received: by 2002:a24:2812:: with SMTP id h18mr1127901ith.173.1552635772770; Fri, 15 Mar 2019 00:42:52 -0700 (PDT) X-Google-Smtp-Source: APXvYqyarjbyBKYUS2hIjS3/9z24WEo/774xS56yER24rLMu6sBbl09xZ0G6kaDGenWb06nXXMCiog== X-Received: by 2002:a24:2812:: with SMTP id h18mr1127883ith.173.1552635772454; Fri, 15 Mar 2019 00:42:52 -0700 (PDT) Received: from bee.dtc.umn.edu (cs-bee-u.cs.umn.edu. [128.101.106.63]) by smtp.gmail.com with ESMTPSA id w19sm650791ita.33.2019.03.15.00.42.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Mar 2019 00:42:51 -0700 (PDT) From: Kangjie Lu To: kjlu@umn.edu Cc: pakki001@umn.edu, David Sterba , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] fs: affs: fix a NULL pointer dereference Date: Fri, 15 Mar 2019 02:42:44 -0500 Message-Id: <20190315074246.26426-1-kjlu@umn.edu> X-Mailer: git-send-email 2.17.1 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 If affs_bread fails, do not use ext_bh to avoid NULL pointer dereference Signed-off-by: Kangjie Lu --- fs/affs/file.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/affs/file.c b/fs/affs/file.c index a85817f54483..29cbc8eda085 100644 --- a/fs/affs/file.c +++ b/fs/affs/file.c @@ -941,8 +941,10 @@ affs_truncate(struct inode *inode) size = AFFS_SB(sb)->s_hashsize; if (size > blkcnt - blk) size = blkcnt - blk; - for (i = 0; i < size; i++, blk++) - affs_free_block(sb, be32_to_cpu(AFFS_BLOCK(sb, ext_bh, i))); + if (ext_bh) { + for (i = 0; i < size; i++, blk++) + affs_free_block(sb, be32_to_cpu(AFFS_BLOCK(sb, ext_bh, i))); + } affs_free_block(sb, ext_key); ext_key = be32_to_cpu(AFFS_TAIL(sb, ext_bh)->extension); affs_brelse(ext_bh);