From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x2261JXNunT3gKNEoziZRgWejmlQm7w4lJZBT22U6+4voRd8jt+gJoFMfVKJrCkl3cjo5dZbH ARC-Seal: i=1; a=rsa-sha256; t=1516611143; cv=none; d=google.com; s=arc-20160816; b=cpexYVDFHXxsrH0jKYdQ4kDDhXLOIBpgNLKLGpA16E/IoobiEuqBa5LiuI6pEkA1q4 yMR1plV6jFmoR9nd3/SQgM9TiNFd1wD8VOD0zEe1W+v76JbIx7nffyb8oSnYoRxTWPL6 yMNAWmyoQITv2MDaFUb/zmvtlBawUMzLw9W897wW2jYU/jXPwbeT6oVN7SiOo1AD7/CG vDo/GT7KQ+2eIfI+HihOA7klwu2zUNI717TWK2fLxWONFCdOPfaxPdk/wKCl/e9JlKOq +gN2PGEHdyKtUhu7nY0e67FmmHaEO7S6i2PCpdyjGfzPKOIzDUQvalRsePRu05ZGesRO aLsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=z0fJLshpunV0Wlnvj5c6eowbO6hhhhLuU9BqsExmsq0=; b=swPtTSh4kMGfux2TUypkfZ/1cFRFpFVZ2D0A3bJT176Hk5/R4zqeDw4PoS80LyZGh3 Yg4bQ5pfyWbHTsfsjWEoPBezmkeuRgj2+vKfLz7zU3MLamlj5MJ9aUG3UTGWVu3UjBBw QHF7BNULfQrqEVhBvHBPhj8OT8kKKBgmV2Dd52zHr7HNDhkVVMMbRcon8WPj+FLRUC6w t0/uLnM5fr9xiVPr1bNzH8ha3omfBxEpMn4nqdCwHBcb4aqvEGoqzOg6GrI1/kQ9ICcF O+XwJ72OYBx5W3hlQes6SZY44sFcdk6h6dlN9Zp4G3oHYAtmPTIgUTXZS5IATlIQNdId Iepg== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , "Michael J. Ruhl" , Doug Ledford Subject: [PATCH 4.14 22/89] IB/hfi1: Prevent a NULL dereference Date: Mon, 22 Jan 2018 09:45:02 +0100 Message-Id: <20180122083956.888967075@linuxfoundation.org> X-Mailer: git-send-email 2.16.0 In-Reply-To: <20180122083954.683903493@linuxfoundation.org> References: <20180122083954.683903493@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1590282046561225989?= X-GMAIL-MSGID: =?utf-8?q?1590282046561225989?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dan Carpenter commit 57194fa763bfa1a0908f30d4c77835beaa118fcb upstream. In the original code, we set "fd->uctxt" to NULL and then dereference it which will cause an Oops. Fixes: f2a3bc00a03c ("IB/hfi1: Protect context array set/clear with spinlock") Signed-off-by: Dan Carpenter Reviewed-by: Michael J. Ruhl Signed-off-by: Doug Ledford Signed-off-by: Greg Kroah-Hartman --- drivers/infiniband/hw/hfi1/file_ops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/infiniband/hw/hfi1/file_ops.c +++ b/drivers/infiniband/hw/hfi1/file_ops.c @@ -881,11 +881,11 @@ static int complete_subctxt(struct hfi1_ } if (ret) { - hfi1_rcd_put(fd->uctxt); - fd->uctxt = NULL; spin_lock_irqsave(&fd->dd->uctxt_lock, flags); __clear_bit(fd->subctxt, fd->uctxt->in_use_ctxts); spin_unlock_irqrestore(&fd->dd->uctxt_lock, flags); + hfi1_rcd_put(fd->uctxt); + fd->uctxt = NULL; } return ret;