From 0b76b205acbb60551154f26c7a1b5d10d4e34718 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Tue, 9 Apr 2019 15:10:12 +0000 Subject: Reenable debugging options. --- kernel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel.spec b/kernel.spec index 762353970..6a07fdba0 100644 --- a/kernel.spec +++ b/kernel.spec @@ -122,7 +122,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 # Kernel headers are being split out into a separate package %if 0%{?fedora} @@ -1861,6 +1861,9 @@ fi # # %changelog +* Tue Apr 09 2019 Jeremy Cline +- Reenable debugging options. + * Mon Apr 08 2019 Jeremy Cline - 5.1.0-0.rc4.git0.1 - Linux v5.1-rc4 -- cgit From 26ae226f4de08418d2b388e47fa24f56cdafb61f Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Tue, 9 Apr 2019 15:13:32 +0000 Subject: Linux v5.1-rc4-34-g869e3305f23d --- gitrev | 2 +- kernel.spec | 8 +- sources | 1 + ...x-an-invalid-condition-in-tpm_common_poll.patch | 103 --------------------- 4 files changed, 6 insertions(+), 108 deletions(-) delete mode 100644 v3-tpm-fix-an-invalid-condition-in-tpm_common_poll.patch diff --git a/gitrev b/gitrev index 43a9f255c..8bd9920ac 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -ea2cec24c8d429ee6f99040e4eb6c7ad627fe777 +869e3305f23dfeacdaa234717c92ccb237815d90 diff --git a/kernel.spec b/kernel.spec index 6a07fdba0..596c14912 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 4 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -585,9 +585,6 @@ Patch501: input-rmi4-remove-the-need-for-artifical-IRQ.patch Patch506: 0001-s390-jump_label-Correct-asm-contraint.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 %endif @@ -1861,6 +1858,9 @@ fi # # %changelog +* Tue Apr 09 2019 Jeremy Cline - 5.1.0-0.rc4.git1.1 +- Linux v5.1-rc4-34-g869e3305f23d + * Tue Apr 09 2019 Jeremy Cline - Reenable debugging options. diff --git a/sources b/sources index 117c553f0..9ffa45b1a 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (linux-5.0.tar.xz) = 3fbab70c7b03b1a10e9fa14d1e2e1f550faba4f5792b7699ca006951da74ab86e7d7f19c6a67849ab99343186e7d6f2752cd910d76222213b93c1eab90abf1b0 SHA512 (patch-5.1-rc4.xz) = 1feffe95816601137c4b2a09a5d14d8b023d05d7a3bb259ea42a05fc52ca48c8176a4477f88bfe4bcd8220f3e174793ddbefe7896807fdafaf5153934222eac2 +SHA512 (patch-5.1-rc4-git1.xz) = 4ebc38b4213c23c1b72275a7027e7bd0bb565d6c89e2d3c2178ec6bd130acedcb98f700833b627035349fd7aa9c3aad10b26afcfece93811c6afae9612adda14 diff --git a/v3-tpm-fix-an-invalid-condition-in-tpm_common_poll.patch b/v3-tpm-fix-an-invalid-condition-in-tpm_common_poll.patch deleted file mode 100644 index 606373aa4..000000000 --- a/v3-tpm-fix-an-invalid-condition-in-tpm_common_poll.patch +++ /dev/null @@ -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 -X-Patchwork-Id: 10864497 -Return-Path: -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 ; - 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 ; - 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 ; - Thu, 21 Mar 2019 23:02:14 +0000 (UTC) -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand - id S1727157AbfCUXCO (ORCPT - ); - 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 ); - 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 -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: -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 -Tested-by: Mantas Mikulėnas -Signed-off-by: Tadeusz Struk ---- - 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; - } - -- cgit