From patchwork Thu Nov 29 14:38:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1821501 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 95D943FC5A for ; Thu, 29 Nov 2012 14:38:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754813Ab2K2Oiv (ORCPT ); Thu, 29 Nov 2012 09:38:51 -0500 Received: from mail-ie0-f174.google.com ([209.85.223.174]:53541 "EHLO mail-ie0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752836Ab2K2Oiu (ORCPT ); Thu, 29 Nov 2012 09:38:50 -0500 Received: by mail-ie0-f174.google.com with SMTP id k11so12121501iea.19 for ; Thu, 29 Nov 2012 06:38:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject :content-type:content-transfer-encoding:x-gm-message-state; bh=Asn6J1OGt5crip4DqTdIXSkloQvqTPb7fsWFSaYcjRw=; b=INqSyRFpypRxIvF31XR/B+XoNQ8saj+8RQLt68CD0iVQcEYG61raQtA6J+lFGYkPiw LuQ4cQjl0rANmeyEUWYpievQ358H0JfJD0CPuKIQIFjN14PyNVq71Qb2eoSRRBdV5FNB Uq7MsSKBMsRigRYGjC8fLXfPq6mF/en6eNeXUxS8wqS59IekRerj2KFZpJoHJUidyN7T 0+dRRvgLQ7Yr3CL7gr0P0p3rjF2ZfHIwZFCcDLH7OKMW6gBVU9f4H/RzOvAPo/kxeNqV EiU/wn9Hu2k08+jZHWDgG7tRDKg/UAPYCGifUzNfzfdPFTDHNac+b9VdBZYlg2P27Hes 4Elw== Received: by 10.50.190.162 with SMTP id gr2mr25752120igc.65.1354199929989; Thu, 29 Nov 2012 06:38:49 -0800 (PST) Received: from [172.22.22.4] (c-71-195-31-37.hsd1.mn.comcast.net. [71.195.31.37]) by mx.google.com with ESMTPS id hg2sm7306863igc.3.2012.11.29.06.38.47 (version=SSLv3 cipher=OTHER); Thu, 29 Nov 2012 06:38:48 -0800 (PST) Message-ID: <50B77378.1040202@inktank.com> Date: Thu, 29 Nov 2012 08:38:48 -0600 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: ceph-devel Subject: [PATCH] ceph: don't reference req after put X-Gm-Message-State: ALoCoQl1hjbXe5+RFMgldaeG34gddAE3Vt+jFak53lKgeVjwhBeAthpC+WrBy0DDBph/ErEAnRb6 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org In __unregister_request(), there is a call to list_del_init() referencing a request that was the subject of a call to ceph_osdc_put_request() on the previous line. This is not safe, because the request structure could have been freed by the time we reach the list_del_init(). Fix this by reversing the order of these lines. Signed-off-by: Alex Elder Reviewed-by: Sage Weil --- net/ceph/osd_client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) __cancel_osd_timeout(osdc); diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 9b6f0e4..d1177ec 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -797,9 +797,9 @@ static void __unregister_request(struct ceph_osd_client *osdc, req->r_osd = NULL; } + list_del_init(&req->r_req_lru_item); ceph_osdc_put_request(req); - list_del_init(&req->r_req_lru_item); if (osdc->num_requests == 0) { dout(" no requests, canceling timeout\n");