Message ID | 20200601174014.946750792@linuxfoundation.org |
---|---|
State | Superseded |
Headers | show
Return-Path: <SRS0=Ycwd=7O=vger.kernel.org=stable-owner@kernel.org> X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1AD5BC433DF for <stable@archiver.kernel.org>; Mon, 1 Jun 2020 18:59:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EF41820679 for <stable@archiver.kernel.org>; Mon, 1 Jun 2020 18:59:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591037952; bh=AaAstqWpIULhAhMaH2iOAIiWNt43lSgteiVepxvT5dg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=dW2IGgBqTiS4iKKtwEN0TsYlID6sY9L8+waOALkMXp20momyzeIJx5kI+R3tkRIiw XJPuLGvpCW+QHKpSVAioGdD5SZV8eGxvlizt01Om53+jmnihRVg2MPj3EebKDyOuxJ 3ziuCuP+p1hpr/cG1Cv7VNUCMxmN0t3Krns0VRMU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729008AbgFAR5r (ORCPT <rfc822;stable@archiver.kernel.org>); Mon, 1 Jun 2020 13:57:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:39172 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728996AbgFAR5r (ORCPT <rfc822;stable@vger.kernel.org>); Mon, 1 Jun 2020 13:57:47 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 75AA220897; Mon, 1 Jun 2020 17:57:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591034265; bh=AaAstqWpIULhAhMaH2iOAIiWNt43lSgteiVepxvT5dg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yu1pvL435cFquruJN5r+BEoG5cYl69vgtj3K7A+rOgp9tBWYDPA2zavnvoe0/0svM Ka22lCKYB0yTC75ebtfie3cwkzbSf1PfgcbrnqSUC3e/Gpu6j42pU8Jb7AnksBeNxq +n6dfPjBVun58NeAZDbtdO8uNzQBQeS2D0L69PiI= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Lei Xue <carmark.dlut@gmail.com>, Dave Wysochanski <dwysocha@redhat.com>, David Howells <dhowells@redhat.com>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 4.9 17/61] cachefiles: Fix race between read_waiter and read_copier involving op->to_do Date: Mon, 1 Jun 2020 19:53:24 +0200 Message-Id: <20200601174014.946750792@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200601174010.316778377@linuxfoundation.org> References: <20200601174010.316778377@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: <stable.vger.kernel.org> X-Mailing-List: stable@vger.kernel.org |
Series |
None
|
expand
|
diff --git a/fs/cachefiles/rdwr.c b/fs/cachefiles/rdwr.c index 799b59d96fe2..7dba96d5fef1 100644 --- a/fs/cachefiles/rdwr.c +++ b/fs/cachefiles/rdwr.c @@ -64,9 +64,9 @@ static int cachefiles_read_waiter(wait_queue_t *wait, unsigned mode, object = container_of(op->op.object, struct cachefiles_object, fscache); spin_lock(&object->work_lock); list_add_tail(&monitor->op_link, &op->to_do); + fscache_enqueue_retrieval(op); spin_unlock(&object->work_lock); - fscache_enqueue_retrieval(op); fscache_put_retrieval(op); return 0; }