Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp1737345pxb; Sat, 15 Jan 2022 22:45:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJwd8Wqjp6/tNolC7bgqrju6gfHAbgduaclB4ZtEiQk0v3Rk9dQ18IvtgYKOQWIYMYFjQR/G X-Received: by 2002:a17:90b:1811:: with SMTP id lw17mr1643691pjb.120.1642315534319; Sat, 15 Jan 2022 22:45:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642315534; cv=none; d=google.com; s=arc-20160816; b=UvywAVK5wrt2/E1bgHP1SRFkNYl4atEXYj+dUXfKqk+2/cIFANxlpWYPbG6a2wZ/pl CqUOl4P7kF3qnYz0j3ehtMTGyoWyvrkPZUZBzOuxqnTwJ+ynEJ9p5KoJh04h6RKg7fxo 9jSnTKEorYIRDcVQ4aNT0s7jbc9SYB1G2SsUKxNS0Mb9+CLxI2BeCEGDhLA8UZdK/xHy 9/rNMIPDrCKXyJDoRIINMnWXuxjCdsb/XwGqJsR10sVlU4cBkXk09A76Zs86dQjShWC4 aK0eRdqnJQTD2rmEp4L9uh94JjB4acrGunnQVb6gI3yQa3izc0mmM+/YQsX93yUWvMbx kDvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=ePWS8huBNB8mOLwzP5l9zhhnqwr/R2aV/N6dfRb+pkA=; b=puAPn6FH1nze/ZfELPcltpWtzY+/Wiizq23fv1tostGuvOxuRKV7IFHe+p6Ki6wtNi Yf/GjsneZVQnEmo2D6vpnnmOShhnVr5KQt5AxH8NbPTxr9nSfNOLN5tZ2iR55Di23CRH P0ZKoM2z5OSg5Y5pmeSd0HwIG+S1f+/fC63vXWWFnorfe+3tI5FAc/gfwQ+v+s+Nh4ul XLuMZhaoeE6dTu8EUVaxVdmHaiFN9gHOspmOIYi/hESn0mHGgKyh49btgNZ0mYboForF JG+Rgi0EVWvdiVqc4rriiKcuQkyrepWYwsXDxQxL3EPgUCwNiFQY+F+hQWxM+jvAAUSb 57rw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=vnd9YjeT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a3si11015757pgj.627.2022.01.15.22.45.23; Sat, 15 Jan 2022 22:45:34 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=vnd9YjeT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231841AbiAOM10 (ORCPT + 99 others); Sat, 15 Jan 2022 07:27:26 -0500 Received: from smtp-relay-internal-0.canonical.com ([185.125.188.122]:47532 "EHLO smtp-relay-internal-0.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231168AbiAOM1E (ORCPT ); Sat, 15 Jan 2022 07:27:04 -0500 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id C543440045 for ; Sat, 15 Jan 2022 12:26:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1642249618; bh=ePWS8huBNB8mOLwzP5l9zhhnqwr/R2aV/N6dfRb+pkA=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=vnd9YjeTAkXxpN3SWdBQaa337/49tJieZIqgKEBiUQHWsuzpNxPY34sQ/iKaPtIuy kftQO22UqiTrGMG/MxJhOPjcVk7bvbyyiyfnHPadRsVUnmVuVyzekYEg6y0pSpNseh UjijZ9YXB3JbAhYa1ceOkL/G50f/h+jenmGykR92DiqW09cjMLhSDFVujHC3cD4/t+ upyEjk3kN5x12CDupekVUT5Iyc5RByF5b2rOo9AC2sUWd2t2Dty9qc1oHxsm3mp+RE 20e5f0hNC88RcwqBVUJMuuIt1OEzULtpV4MaY2hfytZ1WWHFVvmX7TTDyzLTwJgS1O wpHmt3U1o0LUg== Received: by mail-wm1-f72.google.com with SMTP id p14-20020a1c544e000000b003490705086bso3429328wmi.7 for ; Sat, 15 Jan 2022 04:26:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ePWS8huBNB8mOLwzP5l9zhhnqwr/R2aV/N6dfRb+pkA=; b=7FqXabpZ8cewaOUqH7biFqkx9iE8Yxof0Noz2Du2tG5mCbmllKTamOE67AeR0QsZFV ermU1UoYxymQ1aHlysmGvp/gbUfyEsHJR9YHIohOd1Vcw/KuirsE+piw6nYw6H2q67Hf E5tXmTQ4sone6N4W8rcXH9dW7PLb/NxR/2oFPqxRRxug4gzE2l5Y4bMCNo1Wba7anppK izmhT2oe5D3IxJxlKIbPzocCxVXr1R0VamiGM/ifDSsK2jIYHurb2OVM8f4pX931Lljt aMn5GbCn6r7C9ibRvMY8RjaWzNLrjNTrm+nzB95BcInyuXaP2X2akRKEBuTbekJFnoNF FGSg== X-Gm-Message-State: AOAM532zlRJsPYcJgHtR/DyG7EuY5v522J030lc2tmbZ+niFi4MwwiJ2 myHKJ4J6p9KokPS9dqPHq32FaNz3XPosc3AM+NwjwAQsNJg6CpXoEJ0BEeuK9pR/BQ5DIA6JUsY ag3RRwLmStlUaEzilVgp2tlK09LaXAJniM+OqCALtaw== X-Received: by 2002:a5d:6f0a:: with SMTP id ay10mr12121174wrb.191.1642249618562; Sat, 15 Jan 2022 04:26:58 -0800 (PST) X-Received: by 2002:a5d:6f0a:: with SMTP id ay10mr12121168wrb.191.1642249618445; Sat, 15 Jan 2022 04:26:58 -0800 (PST) Received: from localhost.localdomain (xdsl-188-155-168-84.adslplus.ch. [188.155.168.84]) by smtp.gmail.com with ESMTPSA id bk17sm7878476wrb.105.2022.01.15.04.26.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Jan 2022 04:26:57 -0800 (PST) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , "David S. Miller" , Jakub Kicinski , linux-nfc@lists.01.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/7] nfc: llcp: simplify llcp_sock_connect() error paths Date: Sat, 15 Jan 2022 13:26:46 +0100 Message-Id: <20220115122650.128182-4-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220115122650.128182-1-krzysztof.kozlowski@canonical.com> References: <20220115122650.128182-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The llcp_sock_connect() error paths were using a mixed way of central exit (goto) and cleanup Signed-off-by: Krzysztof Kozlowski --- net/nfc/llcp_sock.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/nfc/llcp_sock.c b/net/nfc/llcp_sock.c index e92440c0c4c7..fdf0856182c6 100644 --- a/net/nfc/llcp_sock.c +++ b/net/nfc/llcp_sock.c @@ -712,10 +712,8 @@ static int llcp_sock_connect(struct socket *sock, struct sockaddr *_addr, llcp_sock->local = nfc_llcp_local_get(local); llcp_sock->ssap = nfc_llcp_get_local_ssap(local); if (llcp_sock->ssap == LLCP_SAP_MAX) { - nfc_llcp_local_put(llcp_sock->local); - llcp_sock->local = NULL; ret = -ENOMEM; - goto put_dev; + goto sock_llcp_put_local; } llcp_sock->reserved_ssap = llcp_sock->ssap; @@ -760,11 +758,13 @@ static int llcp_sock_connect(struct socket *sock, struct sockaddr *_addr, sock_llcp_release: nfc_llcp_put_ssap(local, llcp_sock->ssap); + +sock_llcp_put_local: nfc_llcp_local_put(llcp_sock->local); llcp_sock->local = NULL; + llcp_sock->dev = NULL; put_dev: - llcp_sock->dev = NULL; nfc_put_device(dev); error: -- 2.32.0