From patchwork Wed Dec 30 16:05:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 7934151 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A09B99F387 for ; Wed, 30 Dec 2015 16:06:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CB523202C8 for ; Wed, 30 Dec 2015 16:06:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A4E3B20123 for ; Wed, 30 Dec 2015 16:06:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752587AbbL3QGO (ORCPT ); Wed, 30 Dec 2015 11:06:14 -0500 Received: from mail-io0-f175.google.com ([209.85.223.175]:35759 "EHLO mail-io0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752519AbbL3QGO (ORCPT ); Wed, 30 Dec 2015 11:06:14 -0500 Received: by mail-io0-f175.google.com with SMTP id 77so44666563ioc.2 for ; Wed, 30 Dec 2015 08:06:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=primarydata-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=eq4cqqVg87bK+zjgEPPxSqsQt+pv5EQfwoQrOFQX2aQ=; b=OXWqXDQYH/N7okQmQ/lc+KsLf64iWqsnWYSK7JlsKF4mSC5f9GNbxeM/gp6xKiFlhi z0iIas5GoMlZ37uAMrpI4Xwj2Fu80vTFOvg5iZ72ft0HRGWMRgR82E+c7mKxl+9lmOwq 3eL7gJQWoxLMDqSwcFj+791VthWTMqlYyqf49pethq+F7rf+VnNaDbzfJBqq9Y5D8ZPG cjZHBTeHKEb0F0KeKmjB1Zblkw+clAC0WTXauCvgbqRm4Qsbxc6x1SJ6OI+rOLl1eSQt khKo/xDJHZgwI1Dr1ZKcgwb4fb1pZfgfFZefEceAzO7AEOhWXDQmWVFStYzrr2yTUNm4 bTQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=eq4cqqVg87bK+zjgEPPxSqsQt+pv5EQfwoQrOFQX2aQ=; b=Tcf25g2jycQw50ehaDnH0y8ZoSbVFF3G7oU8wixSfwUD04yRR66qbfiIBZZSiiUgfq NBzk3RRgocJO8dNNzJyIHnBMKHWco8vnILdduu3gfGHr+us6SX7BZLvyLRfsgPzY6btS t5KOneef2XeNmI59TxVWRf9Fov+PvOJ3K18aD0YcPNhurv+zgsyy1mGhYHIpZNUAW2+D c+4y3TGAdF/AU7JLuWWUXQ1HoLbR7DGsp/DvBWi3UMCw5B+ME7muAkrQcxA6p2D7Gsgk 2BfzTy0STjYbF7S1PdFD7YSCMhsHmtonujX0uYUiFGJqvfkmeT3XvAZqd09dozywFTEA 2kOQ== X-Gm-Message-State: ALoCoQlcebzJhH/Dtq42r4iLQJi9+Q1mKTOS75a8uFQJ4RvYj/tFwf98iFOxzeZtueuTtAFP1dpEdasZ/Yw13MdIio7crajEWg== X-Received: by 10.107.136.36 with SMTP id k36mr5924003iod.117.1451491573252; Wed, 30 Dec 2015 08:06:13 -0800 (PST) Received: from leira.trondhjem.org.localdomain (c-68-49-164-203.hsd1.mi.comcast.net. [68.49.164.203]) by smtp.gmail.com with ESMTPSA id d9sm2726794igz.17.2015.12.30.08.06.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Dec 2015 08:06:12 -0800 (PST) From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH] pNFS/flexfiles: Fix an Oopsable typo in ff_mirror_match_fh() Date: Wed, 30 Dec 2015 11:05:45 -0500 Message-Id: <1451491545-10885-1-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.5.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 Jeff reports seeing an Oops in ff_layout_alloc_lseg. Turns out copy+paste has played cruel tricks on a nested loop. Reported-by: Jeff Layton Cc: stable@vger.kernel.org # 4.3+ Signed-off-by: Trond Myklebust --- fs/nfs/flexfilelayout/flexfilelayout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfs/flexfilelayout/flexfilelayout.c b/fs/nfs/flexfilelayout/flexfilelayout.c index 03516c80855a..405f46ba490e 100644 --- a/fs/nfs/flexfilelayout/flexfilelayout.c +++ b/fs/nfs/flexfilelayout/flexfilelayout.c @@ -145,7 +145,7 @@ static bool ff_mirror_match_fh(const struct nfs4_ff_layout_mirror *m1, return false; for (i = 0; i < m1->fh_versions_cnt; i++) { bool found_fh = false; - for (j = 0; j < m2->fh_versions_cnt; i++) { + for (j = 0; j < m2->fh_versions_cnt; j++) { if (nfs_compare_fh(&m1->fh_versions[i], &m2->fh_versions[j]) == 0) { found_fh = true;