From patchwork Mon Jul 12 12:18:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 1503934 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=nefemiRw; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GNjWQ1M8Fz9sWd; Mon, 12 Jul 2021 22:19:45 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1m2uuU-0002YG-B1; Mon, 12 Jul 2021 12:19:42 +0000 Received: from smtp-relay-canonical-0.internal ([10.131.114.83] helo=smtp-relay-canonical-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1m2uuR-0002XP-8R for kernel-team@lists.ubuntu.com; Mon, 12 Jul 2021 12:19:39 +0000 Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPS id 150C5405E4 for ; Mon, 12 Jul 2021 12:19:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1626092379; bh=5w+6TDgEK0X/DfGrnabl3/aJMU4CG+1a1/u8oWWs7tA=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=nefemiRwk/VpgRX6uI0iCBNldSyO2Zn0FbBjtvYN+y0GaEp5hKdVtVrIUdBH9A6XV wmioKKxLzFDmiyAVWjCZliEc01aHtLfuBDd7wwG19RSh2984jVH0DJWaLikZgE/8eo B/tPgjymYRoBMhvlnauSyrjVEIi/uiuS9rBoiRqIWmygvjzBzakqPKpScazfP+vqr1 mL9DcvfWcsIM2HtUBMcl046zqk5SmcTAwnTBXrP/xdhWAXk0AKM/FivTf0F5gGLEYy hGee89ECGf0QJIBVxsf0lvG53wLsOgpN7NB8tTA9qY7hsEpg3BYlulH83hvSanT+3a i+o3VRvBEVGAQ== Received: by mail-pf1-f198.google.com with SMTP id i13-20020aa78b4d0000b02902ea019ef670so12779170pfd.0 for ; Mon, 12 Jul 2021 05:19:39 -0700 (PDT) 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=5w+6TDgEK0X/DfGrnabl3/aJMU4CG+1a1/u8oWWs7tA=; b=Fw+aKipNcqoK9W0mh1zkQyg7tCp5V3GeG7N1uSkTW/TJIC90w+2Q+aLGpKUy/oCvxU 6R/Vp4dk4UksbnaVJs4k8iaxdhCai3QQJeDCoWldhGFrKa7B1B38pnJC+UX7o9h9TvC+ U3Rp+VhT3ckDe9fawG+1pJKQ5Sa54bslW1FgIoFvHfE4ze9hq53qi7lcGCsYBUZ0HKL5 Is6FGk61rdYfWWeMXowtvuggkY9Mr1fqfYM6mcQPNr8LGFJFTxMMApVH+/vx0QpVlNvD eZon1LOh7/jSzYUwWsHopNd75YmTCqzlJCtAgJDJAmoRrb32ehroIuHSbWZDYEFKyXwY 1clg== X-Gm-Message-State: AOAM533YRqhbz3cddcHmYKt0QXS/vkHR+3gObPApX6roVKFzzkWoA2ju gqmbuQMUsPS9gHcKngWsGJA5WJOScRirywX7EcEqELlUoQJo54Sv/SdJYIrAbeyKikn2yz5RGcW bLmteqKzaikI1YRAz1uLEpqWZeQ06uy/71jgSnePH9Q== X-Received: by 2002:a17:90a:640b:: with SMTP id g11mr13907928pjj.155.1626092377401; Mon, 12 Jul 2021 05:19:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyLCJx52CdSa2E2SVnLDt6A7SkF7OaTyuK2WYiq2YG/99rXIpoUEGfgT5rnHrO1N9myk8fnSA== X-Received: by 2002:a17:90a:640b:: with SMTP id g11mr13907921pjj.155.1626092377238; Mon, 12 Jul 2021 05:19:37 -0700 (PDT) Received: from localhost.localdomain ([69.163.84.166]) by smtp.gmail.com with ESMTPSA id f2sm15064784pfe.23.2021.07.12.05.19.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:19:36 -0700 (PDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/2] cifs: handle empty list of targets in cifs_reconnect() Date: Mon, 12 Jul 2021 06:18:54 -0600 Message-Id: <20210712121854.6891-3-tim.gardner@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712121854.6891-1-tim.gardner@canonical.com> References: <20210712121854.6891-1-tim.gardner@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Paulo Alcantara BugLink: https://bugs.launchpad.net/bugs/1935833 In case there were no cached DFS referrals in reconn_setup_dfs_targets(), set cifs_sb to NULL prior to calling reconn_set_next_dfs_target() so it would not try to access an empty tgt_list. Signed-off-by: Paulo Alcantara (SUSE) Reviewed-by: Aurelien Aptel Signed-off-by: Steve French (cherry picked from commit a52930353eaf443489a350a135c5525a4acbbf56) Signed-off-by: Tim Gardner --- fs/cifs/connect.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 69c1dbaa65196..bed857d94e8f0 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -513,11 +513,13 @@ cifs_reconnect(struct TCP_Server_Info *server) sb = NULL; } else { cifs_sb = CIFS_SB(sb); - rc = reconn_setup_dfs_targets(cifs_sb, &tgt_list); - if (rc && (rc != -EOPNOTSUPP)) { - cifs_server_dbg(VFS, "%s: no target servers for DFS failover\n", - __func__); + if (rc) { + cifs_sb = NULL; + if (rc != -EOPNOTSUPP) { + cifs_server_dbg(VFS, "%s: no target servers for DFS failover\n", + __func__); + } } else { server->nr_targets = dfs_cache_get_nr_tgts(&tgt_list); }