Linux v5.1-rc4-34-g869e3305f23d

This commit is contained in:
Jeremy Cline 2019-04-09 15:13:32 +00:00
parent 0b76b205ac
commit 26ae226f4d
4 changed files with 6 additions and 108 deletions

2
gitrev
View File

@ -1 +1 @@
ea2cec24c8d429ee6f99040e4eb6c7ad627fe777 869e3305f23dfeacdaa234717c92ccb237815d90

View File

@ -69,7 +69,7 @@ Summary: The Linux kernel
# The rc snapshot level # The rc snapshot level
%global rcrev 4 %global rcrev 4
# The git snapshot level # The git snapshot level
%define gitrev 0 %define gitrev 1
# Set rpm version accordingly # Set rpm version accordingly
%define rpmversion 5.%{upstream_sublevel}.0 %define rpmversion 5.%{upstream_sublevel}.0
%endif %endif
@ -585,9 +585,6 @@ Patch501: input-rmi4-remove-the-need-for-artifical-IRQ.patch
Patch506: 0001-s390-jump_label-Correct-asm-contraint.patch Patch506: 0001-s390-jump_label-Correct-asm-contraint.patch
Patch507: 0001-Drop-that-for-now.patch Patch507: 0001-Drop-that-for-now.patch
# rhbz 1688283
Patch512: v3-tpm-fix-an-invalid-condition-in-tpm_common_poll.patch
# END OF PATCH DEFINITIONS # END OF PATCH DEFINITIONS
%endif %endif
@ -1861,6 +1858,9 @@ fi
# #
# #
%changelog %changelog
* Tue Apr 09 2019 Jeremy Cline <jcline@redhat.com> - 5.1.0-0.rc4.git1.1
- Linux v5.1-rc4-34-g869e3305f23d
* Tue Apr 09 2019 Jeremy Cline <jcline@redhat.com> * Tue Apr 09 2019 Jeremy Cline <jcline@redhat.com>
- Reenable debugging options. - Reenable debugging options.

View File

@ -1,2 +1,3 @@
SHA512 (linux-5.0.tar.xz) = 3fbab70c7b03b1a10e9fa14d1e2e1f550faba4f5792b7699ca006951da74ab86e7d7f19c6a67849ab99343186e7d6f2752cd910d76222213b93c1eab90abf1b0 SHA512 (linux-5.0.tar.xz) = 3fbab70c7b03b1a10e9fa14d1e2e1f550faba4f5792b7699ca006951da74ab86e7d7f19c6a67849ab99343186e7d6f2752cd910d76222213b93c1eab90abf1b0
SHA512 (patch-5.1-rc4.xz) = 1feffe95816601137c4b2a09a5d14d8b023d05d7a3bb259ea42a05fc52ca48c8176a4477f88bfe4bcd8220f3e174793ddbefe7896807fdafaf5153934222eac2 SHA512 (patch-5.1-rc4.xz) = 1feffe95816601137c4b2a09a5d14d8b023d05d7a3bb259ea42a05fc52ca48c8176a4477f88bfe4bcd8220f3e174793ddbefe7896807fdafaf5153934222eac2
SHA512 (patch-5.1-rc4-git1.xz) = 4ebc38b4213c23c1b72275a7027e7bd0bb565d6c89e2d3c2178ec6bd130acedcb98f700833b627035349fd7aa9c3aad10b26afcfece93811c6afae9612adda14

View File

@ -1,103 +0,0 @@
From patchwork Thu Mar 21 23:02:12 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Patchwork-Submitter: Tadeusz Struk <tadeusz.struk@intel.com>
X-Patchwork-Id: 10864497
Return-Path: <linux-integrity-owner@kernel.org>
Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
[172.30.200.125])
by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 711816C2
for <patchwork-linux-integrity@patchwork.kernel.org>;
Thu, 21 Mar 2019 23:02:15 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 57B312A4A8
for <patchwork-linux-integrity@patchwork.kernel.org>;
Thu, 21 Mar 2019 23:02:15 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
id 4AA482A539; Thu, 21 Mar 2019 23:02:15 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
pdx-wl-mail.web.codeaurora.org
X-Spam-Level:
X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI,
RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C399A2A4A8
for <patchwork-linux-integrity@patchwork.kernel.org>;
Thu, 21 Mar 2019 23:02:14 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S1727157AbfCUXCO (ORCPT
<rfc822;patchwork-linux-integrity@patchwork.kernel.org>);
Thu, 21 Mar 2019 19:02:14 -0400
Received: from mga04.intel.com ([192.55.52.120]:7149 "EHLO mga04.intel.com"
rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
id S1727086AbfCUXCO (ORCPT <rfc822;linux-integrity@vger.kernel.org>);
Thu, 21 Mar 2019 19:02:14 -0400
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from orsmga004.jf.intel.com ([10.7.209.38])
by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;
21 Mar 2019 16:02:13 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.60,254,1549958400";
d="scan'208";a="284777192"
Received: from jdemuth-mobl.amr.corp.intel.com (HELO
tstruk-mobl1.jf.intel.com) ([10.251.150.110])
by orsmga004.jf.intel.com with ESMTP; 21 Mar 2019 16:02:13 -0700
Subject: [PATCH v3] tpm: fix an invalid condition in tpm_common_poll
From: Tadeusz Struk <tadeusz.struk@intel.com>
To: jarkko.sakkinen@linux.intel.com
Cc: grawity@gmail.com, James.Bottomley@HansenPartnership.com,
linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org,
stable@vger.kernel.org, tadeusz.struk@intel.com
Date: Thu, 21 Mar 2019 16:02:12 -0700
Message-ID:
<155320933278.5015.1752135965699928631.stgit@tstruk-mobl1.jf.intel.com>
User-Agent: StGit/unknown-version
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Sender: linux-integrity-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-integrity.vger.kernel.org>
X-Mailing-List: linux-integrity@vger.kernel.org
X-Virus-Scanned: ClamAV using ClamSMTP
The poll condition should only check response_length,
because reads should only be issued if there is data to read.
The response_read flag only prevents double writes.
The problem was that the write set the response_read to false,
enqued a tpm job, and returned. Then application called poll
which checked the response_read flag and returned EPOLLIN.
Then the application called read, but got nothing.
After all that the async_work kicked in.
Added also mutex_lock around the poll check to prevent
other possible race conditions.
Fixes: 9488585b21bef0df12 ("tpm: add support for partial reads")
Reported-by: Mantas Mikulėnas <grawity@gmail.com>
Tested-by: Mantas Mikulėnas <grawity@gmail.com>
Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
---
drivers/char/tpm/tpm-dev-common.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/char/tpm/tpm-dev-common.c b/drivers/char/tpm/tpm-dev-common.c
index 5eecad233ea1..7312d3214381 100644
--- a/drivers/char/tpm/tpm-dev-common.c
+++ b/drivers/char/tpm/tpm-dev-common.c
@@ -203,12 +203,14 @@ __poll_t tpm_common_poll(struct file *file, poll_table *wait)
__poll_t mask = 0;
poll_wait(file, &priv->async_wait, wait);
+ mutex_lock(&priv->buffer_mutex);
- if (!priv->response_read || priv->response_length)
+ if (priv->response_length)
mask = EPOLLIN | EPOLLRDNORM;
else
mask = EPOLLOUT | EPOLLWRNORM;
+ mutex_unlock(&priv->buffer_mutex);
return mask;
}