From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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=-6.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham 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 BEFD9C433DF for ; Sat, 30 May 2020 13:18:21 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 81D722074A for ; Sat, 30 May 2020 13:18:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 81D722074A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ravnborg.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F40DE6E061; Sat, 30 May 2020 13:18:20 +0000 (UTC) Received: from asavdk3.altibox.net (asavdk3.altibox.net [109.247.116.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id D93326E061 for ; Sat, 30 May 2020 13:18:19 +0000 (UTC) Received: from ravnborg.org (unknown [158.248.194.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by asavdk3.altibox.net (Postfix) with ESMTPS id D524E20023; Sat, 30 May 2020 15:18:16 +0200 (CEST) Date: Sat, 30 May 2020 15:18:15 +0200 From: Sam Ravnborg To: Emil Velikov Subject: Re: [PATCH v2 2/2] drm/auth: make drm_{set,drop]master_ioctl symmetrical Message-ID: <20200530131815.GA82487@ravnborg.org> References: <20200530124640.4176323-1-emil.l.velikov@gmail.com> <20200530124640.4176323-2-emil.l.velikov@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200530124640.4176323-2-emil.l.velikov@gmail.com> X-CMAE-Score: 0 X-CMAE-Analysis: v=2.3 cv=edQTgYMH c=1 sm=1 tr=0 a=UWs3HLbX/2nnQ3s7vZ42gw==:117 a=UWs3HLbX/2nnQ3s7vZ42gw==:17 a=kj9zAlcOel0A:10 a=7gkXJVJtAAAA:8 a=DfNHnWVPAAAA:8 a=pGLkceISAAAA:8 a=i9wYiXSb3f5uVhTpkwcA:9 a=CjuIK1q_8ugA:10 a=E9Po1WZjFZOl8hwRPBS3:22 a=rjTVMONInIDnV1a_A2c_:22 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , Colin Ian King , dri-devel@lists.freedesktop.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi Emil. On Sat, May 30, 2020 at 01:46:40PM +0100, Emil Velikov wrote: > Currently the ret handling is all over the place - with two redundant > assignments and another one addressed earlier. > > Use the exact same flow in both functions. > > v2: straighten the code flow, instead of just removing the assignments Now even I should be able to follow the flow - thanks :-) > > Cc: David Airlie > Cc: Daniel Vetter > Cc: Sam Ravnborg > Cc: Colin Ian King > Signed-off-by: Emil Velikov Reviewed-by: Sam Ravnborg > --- > Colin, pretty sure that this should address couple of Coverity warnings. > Yet I didn't check their web UI thingy. > --- > drivers/gpu/drm/drm_auth.c | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c > index 4c723e3a689c..f2d46b7ac6f9 100644 > --- a/drivers/gpu/drm/drm_auth.c > +++ b/drivers/gpu/drm/drm_auth.c > @@ -215,7 +215,7 @@ drm_master_check_perm(struct drm_device *dev, struct drm_file *file_priv) > int drm_setmaster_ioctl(struct drm_device *dev, void *data, > struct drm_file *file_priv) > { > - int ret = 0; > + int ret; > > mutex_lock(&dev->master_mutex); > > @@ -272,12 +272,15 @@ int drm_dropmaster_ioctl(struct drm_device *dev, void *data, > if (ret) > goto out_unlock; > > - ret = -EINVAL; > - if (!drm_is_current_master(file_priv)) > + if (!drm_is_current_master(file_priv)) { > + ret = -EINVAL; > goto out_unlock; > + } > > - if (!dev->master) > + if (!dev->master) { > + ret = -EINVAL; > goto out_unlock; > + } > > if (file_priv->master->lessor != NULL) { > DRM_DEBUG_LEASE("Attempt to drop lessee %d as master\n", file_priv->master->lessee_id); > @@ -285,7 +288,6 @@ int drm_dropmaster_ioctl(struct drm_device *dev, void *data, > goto out_unlock; > } > > - ret = 0; > drm_drop_master(dev, file_priv); > out_unlock: > mutex_unlock(&dev->master_mutex); > -- > 2.25.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel