From patchwork Thu May 22 20:43:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rickard Strandqvist X-Patchwork-Id: 4226431 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3742CBF90B for ; Thu, 22 May 2014 20:43:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6BBDA201CE for ; Thu, 22 May 2014 20:43:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9A2D7202BE for ; Thu, 22 May 2014 20:43:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752235AbaEVUnI (ORCPT ); Thu, 22 May 2014 16:43:08 -0400 Received: from mail-ee0-f51.google.com ([74.125.83.51]:54596 "EHLO mail-ee0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751566AbaEVUmy (ORCPT ); Thu, 22 May 2014 16:42:54 -0400 Received: by mail-ee0-f51.google.com with SMTP id e51so3033555eek.38 for ; Thu, 22 May 2014 13:42:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=UMYZEQXZboMN2sXq/+ySOSLEcdD64/SewcvMfD30oDk=; b=eRoepzUTgM2z015ayPrP7YGXLd1Q9jzMb3CEHI5RZZHIRO79MFJNkq73s2lP5z8hCh DfvGJFJMX9tjowJcmFxsDYo0239Zee6fy3mwlOMkbXGtMDPEbgSC//S6W/IjhwnL8zcg vaKCfSvClo62pFMnR2PFeOwP2U3Oxr9FvLVGc+taZCGCfBZrtOXjlou714ULFK3se3l+ dI598JxsAN1lgfvZp+f8p/FDi5MrQlLHfa4csF6HSnAA/7JHsca4Y/usqLSi9UYsEU9a e7Dz0EMk1VqGH8TqcWvRThib6C+88crrVeeJ0H7P+CXuheChkgyXPHNy5wZmzcmEm/+K s2ug== X-Gm-Message-State: ALoCoQkn2w7o/vr9uWcTfPTP8LcIrHBqio/0plI8myR0lAdrgqU+ypQCeLYO4SwY8WYoxyGL1vKM X-Received: by 10.15.21.200 with SMTP id d48mr1188733eeu.25.1400791373529; Thu, 22 May 2014 13:42:53 -0700 (PDT) Received: from localhost.localdomain (h-245-62.a218.priv.bahnhof.se. [85.24.245.62]) by mx.google.com with ESMTPSA id o49sm2981472eep.33.2014.05.22.13.42.51 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 May 2014 13:42:52 -0700 (PDT) From: Rickard Strandqvist To: Chris Mason , Josef Bacik Cc: Rickard Strandqvist , linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] fs: btrfs: volumes.c: Fix for possible null pointer dereference Date: Thu, 22 May 2014 22:43:43 +0200 Message-Id: <1400791423-11935-1-git-send-email-rickard_strandqvist@spectrumdigital.se> X-Mailer: git-send-email 1.7.10.4 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP There is otherwise a risk of a possible null pointer dereference. Was largely found by using a static code analysis program called cppcheck. Signed-off-by: Rickard Strandqvist --- fs/btrfs/volumes.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 49d7fab..d85a225 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -1674,11 +1674,12 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path) struct btrfs_fs_devices *fs_devices; fs_devices = root->fs_info->fs_devices; while (fs_devices) { - if (fs_devices->seed == cur_devices) + if (fs_devices->seed == cur_devices) { + fs_devices->seed = cur_devices->seed; break; + } fs_devices = fs_devices->seed; } - fs_devices->seed = cur_devices->seed; cur_devices->seed = NULL; lock_chunks(root); __btrfs_close_devices(cur_devices);