From patchwork Wed Jun 25 17:16:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 4422391 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5680C9F1D6 for ; Wed, 25 Jun 2014 17:17:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7ADE320396 for ; Wed, 25 Jun 2014 17:17:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9D96620394 for ; Wed, 25 Jun 2014 17:17:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757647AbaFYRRL (ORCPT ); Wed, 25 Jun 2014 13:17:11 -0400 Received: from mail-la0-f43.google.com ([209.85.215.43]:48849 "EHLO mail-la0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757578AbaFYRRJ (ORCPT ); Wed, 25 Jun 2014 13:17:09 -0400 Received: by mail-la0-f43.google.com with SMTP id e16so1007535lan.30 for ; Wed, 25 Jun 2014 10:17:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=L6ml0OMn7RScsJTsk1oe75ZkyhuI3sR/XLHNIGA4+u4=; b=WOltfZ5keV7u2tzVPwMUuQlH3XaoFcH9CD6eYwU5FLa7vArrsIvu6Zz3IHMpoW193z PNCReoYjhES3nssm5ojqyDdsXsx1wZijQHzxNb2Zl8unNjuX0t4rGu4rNL2r5U3HKcIN NlOMrqFRHFluCpOVCGz3Lw6rAC/lJyki++GDihMFoSF/6o+NMs4R6F9ZIqa/hzf46cVi P9aMsmH6/0bR+RZLpTbIWzQAYYA8vJn04mg2Mx+TsDd0wkfzabIGOQyJz1FaAaPCUMlj 88JqrQoICxK//FL0bAnZtF6o7c2VUCyDX9cfdH5VbJHBVkXGLXOgV/dUKsDchxS9fQ3D jH+Q== X-Gm-Message-State: ALoCoQmXxr1a98TCKKRqI27sP1GGQc4LQnn9ZFb9+56J02cze42S3sBLH74nwJiadmkxkHRiDbYh X-Received: by 10.112.34.8 with SMTP id v8mr1694743lbi.106.1403716627978; Wed, 25 Jun 2014 10:17:07 -0700 (PDT) Received: from localhost ([109.110.67.53]) by mx.google.com with ESMTPSA id sq7sm4224790lbb.10.2014.06.25.10.17.06 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 25 Jun 2014 10:17:07 -0700 (PDT) From: Ilya Dryomov To: ceph-devel@vger.kernel.org Subject: [PATCH 07/14] libceph: unregister only registered linger requests Date: Wed, 25 Jun 2014 21:16:40 +0400 Message-Id: <1403716607-13535-8-git-send-email-ilya.dryomov@inktank.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1403716607-13535-1-git-send-email-ilya.dryomov@inktank.com> References: <1403716607-13535-1-git-send-email-ilya.dryomov@inktank.com> Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Linger requests that have not yet been registered should not be unregistered by __unregister_linger_request(). This messes up ref count and leads to use-after-free. Signed-off-by: Ilya Dryomov Reviewed-by: Alex Elder --- net/ceph/osd_client.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index a9b7ea7bfdc6..12ec553a7e76 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -1248,7 +1248,9 @@ static void __cancel_request(struct ceph_osd_request *req) static void __register_linger_request(struct ceph_osd_client *osdc, struct ceph_osd_request *req) { - dout("__register_linger_request %p\n", req); + dout("%s %p tid %llu\n", __func__, req, req->r_tid); + WARN_ON(!req->r_linger); + ceph_osdc_get_request(req); list_add_tail(&req->r_linger_item, &osdc->req_linger); if (req->r_osd) @@ -1259,8 +1261,17 @@ static void __register_linger_request(struct ceph_osd_client *osdc, static void __unregister_linger_request(struct ceph_osd_client *osdc, struct ceph_osd_request *req) { - dout("__unregister_linger_request %p\n", req); + WARN_ON(!req->r_linger); + + if (list_empty(&req->r_linger_item)) { + dout("%s %p tid %llu not registered\n", __func__, req, + req->r_tid); + return; + } + + dout("%s %p tid %llu\n", __func__, req, req->r_tid); list_del_init(&req->r_linger_item); + if (req->r_osd) { list_del_init(&req->r_linger_osd_item); maybe_move_osd_to_lru(osdc, req->r_osd);