Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp633559iog; Mon, 13 Jun 2022 09:33:07 -0700 (PDT) X-Google-Smtp-Source: AGRyM1ubnA/KloJ4qHuUHovLC9OK4kv7E8NRFPHogTePANEzmmKsmdPL7Qv9MNrGceDZcHvlCqyB X-Received: by 2002:a17:903:22c6:b0:167:5991:fb63 with SMTP id y6-20020a17090322c600b001675991fb63mr456175plg.37.1655137987519; Mon, 13 Jun 2022 09:33:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655137987; cv=none; d=google.com; s=arc-20160816; b=rUAARkEaz1WP8+R+Zo3hhhOqx5IGhhnVBTzusIexzQKeDDCBFO4xJihIB8lKoN5VWU VoW/I7KluB0ppRhNzUNuhFgnZyqmY9XHZZsN89gBv7q88A5ajCr2EshIS8r1pXh4Ywon tTh+LLRzGOPmxSDqOoiMmGWc4a4FEPyU/FrWwvnkzesnwmS4MdKkj//Dl27pHpE3ytRh T+lB14ofs5DO8W23o0NQChwZUAQHRu67gdorxUzHndzMtl3sdRqADf+EFOqHnyjKt8dW ABqQ9QhbhwRzIWAiePMJenOvn+lZhBQZ6Oh3EH/A0GdNBzSHXzbMav9je5KSaoMRu1c+ jfOA== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=G+sQQPW1KhEeDGKPBC0VC/ilixym+8kv8MUpS/G6u4g=; b=DmQ4XcY3hGYJWKpKV7pj8KK1aCbJhJ4lbKLoxZ7I9LrvvVYlrxuum2gYmWy9xR5RCR g4RtJ58iHmhUceKqXFToY2q8911oUsoeJ/pB7GxauYwtXvWsLQyPfyCewsNp/SlHsDKK pzGlRnv9/q7EEl6IXJMa5oDTrerAxXvr23fuIsouFd5/ljD4ZJv21eEoLXs1hzEnvC0J 01uaBnAKI5MMNumS4AmLtMi8r+5xpmTYL1fhN1JwdlqH8EqwrM2UvziFch1IWV5TwyMO fgkIogOqxuoAZ4DGUms+VzVJhOW/PRM5bhMu1nPqzigC5vHAibevyXw9K7iySe82eZJ9 W7+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=K+IlOJgS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f2-20020a170902ce8200b001675d8490e4si10368568plg.563.2022.06.13.09.32.53; Mon, 13 Jun 2022 09:33:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=K+IlOJgS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376984AbiFMNYB (ORCPT + 99 others); Mon, 13 Jun 2022 09:24:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33444 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377317AbiFMNUP (ORCPT ); Mon, 13 Jun 2022 09:20:15 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 44F1C6A431; Mon, 13 Jun 2022 04:23:29 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C057760FB9; Mon, 13 Jun 2022 11:23:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CD3C1C3411C; Mon, 13 Jun 2022 11:23:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1655119405; bh=3K7C41fTffbQ/v6QxeTjmJCyuQRwcrtVfBjKF8Xfi4A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K+IlOJgS8MVRNLkc1XeYLlpipCYKOs2pzAX4YyIsSLtXKNm5x3cW4om7XPS78BiN9 v9sGeQ8H8XjIcp/H3QYThYnCRQQeBbB+gRP5V0U+oA4Os86Lkby+2KuTLqqseVx3SH F3FlJIEz9p3eBeHqaoDZ/kewXnDomZw63uCkvIOY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Martin Faltesek , Guenter Roeck , Krzysztof Kozlowski , Jakub Kicinski Subject: [PATCH 5.15 227/247] nfc: st21nfca: fix incorrect validating logic in EVT_TRANSACTION Date: Mon, 13 Jun 2022 12:12:09 +0200 Message-Id: <20220613094929.830783940@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220613094922.843438024@linuxfoundation.org> References: <20220613094922.843438024@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Martin Faltesek commit 77e5fe8f176a525523ae091d6fd0fbb8834c156d upstream. The first validation check for EVT_TRANSACTION has two different checks tied together with logical AND. One is a check for minimum packet length, and the other is for a valid aid_tag. If either condition is true (fails), then an error should be triggered. The fix is to change && to ||. Fixes: 26fc6c7f02cb ("NFC: st21nfca: Add HCI transaction event support") Cc: stable@vger.kernel.org Signed-off-by: Martin Faltesek Reviewed-by: Guenter Roeck Reviewed-by: Krzysztof Kozlowski Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- drivers/nfc/st21nfca/se.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/nfc/st21nfca/se.c +++ b/drivers/nfc/st21nfca/se.c @@ -319,7 +319,7 @@ int st21nfca_connectivity_event_received * AID 81 5 to 16 * PARAMETERS 82 0 to 255 */ - if (skb->len < NFC_MIN_AID_LENGTH + 2 && + if (skb->len < NFC_MIN_AID_LENGTH + 2 || skb->data[0] != NFC_EVT_TRANSACTION_AID_TAG) return -EPROTO;