From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932618AbbJMQWa (ORCPT ); Tue, 13 Oct 2015 12:22:30 -0400 Received: from mga02.intel.com ([134.134.136.20]:38230 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932343AbbJMQW3 (ORCPT ); Tue, 13 Oct 2015 12:22:29 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,678,1437462000"; d="scan'208";a="810061461" Subject: Re: [patch] misc: mic/scif: re-take a lock on error path From: Sudeep Dutt To: Dan Carpenter Cc: Sudeep Dutt , Nikhil Rao , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org In-Reply-To: <20151013125206.GA2524@mwanda> References: <20151013125206.GA2524@mwanda> Content-Type: text/plain; charset="UTF-8" Date: Tue, 13 Oct 2015 09:20:22 -0700 Message-ID: <1444753222.93285.236.camel@localhost> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 (2.28.3-30.el6) Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 2015-10-13 at 15:52 +0300, Dan Carpenter wrote: > The caller expects that we take this lock again before returning > otherwise it you get double unlocks and races. > Reviewed-by: Sudeep Dutt Thanks for the fix! > Fixes: ba612aa8b487 ('misc: mic: SCIF memory registration and unregistration') > Signed-off-by: Dan Carpenter > > diff --git a/drivers/misc/mic/scif/scif_rma.c b/drivers/misc/mic/scif/scif_rma.c > index e288996..980ef13 100644 > --- a/drivers/misc/mic/scif/scif_rma.c > +++ b/drivers/misc/mic/scif/scif_rma.c > @@ -680,6 +680,7 @@ int scif_unregister_window(struct scif_window *window) > } > } else { > /* Return ENXIO since unregistration is in progress */ > + mutex_lock(&ep->rma_info.rma_lock); > return -ENXIO; > } > retry: