From patchwork Wed Jul 14 00:48:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve French X-Patchwork-Id: 1504945 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-cifs-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=ALpE/hH5; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4GPf5H0zPwz9sX1 for ; Wed, 14 Jul 2021 10:48:51 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237180AbhGNAvj (ORCPT ); Tue, 13 Jul 2021 20:51:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237113AbhGNAvj (ORCPT ); Tue, 13 Jul 2021 20:51:39 -0400 Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 87090C0613DD for ; Tue, 13 Jul 2021 17:48:48 -0700 (PDT) Received: by mail-lf1-x136.google.com with SMTP id y42so528057lfa.3 for ; Tue, 13 Jul 2021 17:48:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to:cc; bh=42KWca6eNuXtcoPPSYzkMkreLs0lgHPNn4GnIBPajs8=; b=ALpE/hH5ypXs2f5mXTtkKA86IamdKkIAySl7J5fYOrRdBgi3Roqn80WPhlczymS/5b 9UYFw8Xqn60EZ4tA3W8KnhBrMqbwbzRQphUgcKYn2gNvYqLl+qR9muQ+bnwl+c84bYKc nkHO022t5jQgLedWo+JmilAjabwtrjdshLwplr0HXrtQXQvpa6E9ABkcUhdxxHr1DeqE 8sr7yBIbp6hqj+khYY2bxeQ4K/lfe6mj2cTx4tsN3thEolTOscvu3wkBXh+1o9+MMpTN ks7dVfFYtip9KV09nG04yfDzUAbAfQTQoHQPqFgddbaBeWyHdvYYX2WdymIrQxa7miUP eD+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to:cc; bh=42KWca6eNuXtcoPPSYzkMkreLs0lgHPNn4GnIBPajs8=; b=n8ZDOQ/98qaDnRfWyVwJ8g2z67PPsx3rosxnH8Xq2yIh1x8SK9Xiu6/R9JGykR/6Gr 9GiZahNQrCL8+Q9asZDVsVlaqdRu9gpQ2oCUxBYUpRwG3JnrP+R4KWNZdqj3LdIPuyLy zSJzvO1aq7miRIcVjPkUVj7m4VoUkVCvvA7f62uOhksd1TmGTjTnnGT+Ieox76VyfJxP oEa8P/+2jjUy0FNB9uvhjdXhJCrtSMAsaaFKiFow0wHYYfKLcWtX3DaTucQkB3gKbwds hKo45ZNVLXfoXDngQi1HnUFrZPzEKcvRvqKfOY2LLX82VBKCHbR3D7+x8ceXgPaypeMO uyzA== X-Gm-Message-State: AOAM531GorZkhT7TI51EyK+vUwjNoTrMynnETfdwZoXoNBUGwkY1P3RK EcllmoMyd2r2rN8x79PUn7SY5qifsVjWD12FJBOr6Eu48RZgww== X-Google-Smtp-Source: ABdhPJzjI2CerCpGlOJ9x5Swl5JZsMWjilPjXswTxYMCSrfR7bkIcyAFNbTP9/PhRvWm/b6i0nX4DHezib0mpqKLVps= X-Received: by 2002:a05:6512:604:: with SMTP id b4mr5733591lfe.184.1626223725600; Tue, 13 Jul 2021 17:48:45 -0700 (PDT) MIME-Version: 1.0 From: Steve French Date: Tue, 13 Jul 2021 19:48:34 -0500 Message-ID: Subject: [PATCH] cifs: fix missing null session check in mount To: CIFS Cc: Paulo Alcantara Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org Although it is unlikely to be have ended up with a null session pointer calling cifs_try_adding_channels in cifs_mount. Coverity correctly notes that we are already checking for it earlier (when we return from do_dfs_failover), so at a minimum to clarify the code we should make sure we also check for it when we exit the loop so we don't end up calling cifs_try_adding_channels or mount_setup_tlink with a null ses pointer. Addresses-Coverity: 1505608 ("Derefernce after null check") Reviewed-off-by: Paulo Alcantara (SUSE) Signed-off-by: Steve French --- fs/cifs/connect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) kfree(ref_path); From 8b755ad38c72d2dc39fd6e9110d03aa132498571 Mon Sep 17 00:00:00 2001 From: Steve French Date: Tue, 13 Jul 2021 19:40:33 -0500 Subject: [PATCH] cifs: fix missing null session check in mount Although it is unlikely to be have ended up with a null session pointer calling cifs_try_adding_channels in cifs_mount. Coverity correctly notes that we are already checking for it earlier (when we return from do_dfs_failover), so at a minimum to clarify the code we should make sure we also check for it when we exit the loop so we don't end up calling cifs_try_adding_channels or mount_setup_tlink with a null ses pointer. Addresses-Coverity: 1505608 ("Derefernce after null check") Reviewed-by: Paulo Alcantara (SUSE) Signed-off-by: Steve French --- fs/cifs/connect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index db6c607269f5..463cae116c12 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -3577,7 +3577,7 @@ int cifs_mount(struct cifs_sb_info *cifs_sb, struct smb3_fs_context *ctx) rc = -ELOOP; } while (rc == -EREMOTE); - if (rc || !tcon) + if (rc || !tcon || !ses) goto error; kfree(ref_path); -- 2.30.2