From patchwork Fri Apr 21 16:16:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 86410 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1205476vqo; Fri, 21 Apr 2023 09:50:20 -0700 (PDT) X-Google-Smtp-Source: AKy350Z4t7s1/UE2XQaAScvn0LGBIZY0x2xr2AYFuspFdx9NuTP0tQvqU82cRzFJiVMwZiJCxpbH X-Received: by 2002:a05:6a20:86a2:b0:ef:1b1e:a024 with SMTP id k34-20020a056a2086a200b000ef1b1ea024mr5604492pze.59.1682095820084; Fri, 21 Apr 2023 09:50:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682095820; cv=none; d=google.com; s=arc-20160816; b=XMZICL/UanZ06ZCiypuUxyZjTnD5FipOU6bQjSxWhzzDNpIFZac9q3OAz6sZbTs/8p 6qvvF9pTI+9iA+uC80+q9s1rSVoa0uCAdTdUSmseyV7y8ag81FNuby1EsyhbATBCP1EG mMNoaSnXPWH2dCG/2+l6kjBFdzaV0WorStdA2KUpJ2YE9C/DKz+5bnylEISn2T9uuybO 9IXTvmcNh8iMpRo4kXsTmTiDybrJryuewtx/1V+Q/eo0GXgCFTw/7DUD6pt6y1HEFA0f 8p3J56TOvsNb++r70/MJ4xtbBISqUpz4BgGCxahafFaIF/pmFsNK6c5O6KQ0Tjm6zfLM ULqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:content-id:mime-version:subject :cc:to:from:organization:dkim-signature; bh=0tp+aaiy/E7Hvy2jvzMO8gNdfxuSH7jfOPj7r1Xv8Nw=; b=yr+pa2RZTtgM60WBOItq0oJkORKGgMPljQESvf0aInEzSN9M6dz5qi8sUoppL1DngM QMensC4uhs8FVEsRLQXOZtrU8I0E69Yx0TI01xZsbBVqdrHKVsDhiMZkki3qRuOcDJQf ylpgiNSFiYTgeZQSL3AbtXsEOTDHN8tTB0u5uGrzdBo8CUxCeyDVn65EkOmOPsjRe62y ChzE7YhVmWkJ9qMD/JOCLm1oes1kf6rvfn3fpQro3Qhwfa0nWPUe1UDvmMlVJDNixoSt uTV+nwZFix8M9gR4hqhmz+4olKoJ6UvCBfmC3E3nAu7ltJpOefi49oRvfjzKX6EGUr3S 5mqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Iu3GlUWK; 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=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 70-20020a630549000000b00520a22ade70si4747830pgf.422.2023.04.21.09.50.05; Fri, 21 Apr 2023 09:50:20 -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=@redhat.com header.s=mimecast20190719 header.b=Iu3GlUWK; 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=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232848AbjDUQRJ (ORCPT + 99 others); Fri, 21 Apr 2023 12:17:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35704 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231858AbjDUQRI (ORCPT ); Fri, 21 Apr 2023 12:17:08 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC1CF72A8 for ; Fri, 21 Apr 2023 09:16:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682093782; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type; bh=0tp+aaiy/E7Hvy2jvzMO8gNdfxuSH7jfOPj7r1Xv8Nw=; b=Iu3GlUWKO28Nf0y/XenGCuhwZEqJY0/T2cNSm+mmFDxQwibMN3IKtU1S9fqFNmGT0vjVYj 2YuWftuiuOEKUDDF9RNXV08Ua65N3Zuveaw/DjqEBGATpTjjGZLnzSlJlpxUBjXq0XjtFt b7ZKAW9zbZyWOR/iWqGF1z/2MumVDXo= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-655-q_03Udd4PZKnyXWr3yhMzw-1; Fri, 21 Apr 2023 12:16:19 -0400 X-MC-Unique: q_03Udd4PZKnyXWr3yhMzw-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C66713C1179E; Fri, 21 Apr 2023 16:16:18 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.42.28.158]) by smtp.corp.redhat.com (Postfix) with ESMTP id C46DE140EBF4; Fri, 21 Apr 2023 16:16:17 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 From: David Howells To: netdev@vger.kernel.org cc: dhowells@redhat.com, Marc Dionne , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-afs@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH net] rxrpc: Fix error when reading rxrpc tokens MIME-Version: 1.0 Content-ID: <212124.1682093777.1@warthog.procyon.org.uk> Date: Fri, 21 Apr 2023 17:16:17 +0100 Message-ID: <212125.1682093777@warthog.procyon.org.uk> X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763805306754089146?= X-GMAIL-MSGID: =?utf-8?q?1763805306754089146?= From: Marc Dionne When converting from ASSERTCMP to WARN_ON, the tested condition must be inverted, which was missed for this case. This would cause an EIO error when trying to read an rxrpc token, for instance when trying to display tokens with AuriStor's "tokens" command. Fixes: 84924aac08a4 ("rxrpc: Fix checker warning") Signed-off-by: Marc Dionne Signed-off-by: David Howells cc: "David S. Miller" cc: Eric Dumazet cc: Jakub Kicinski cc: Paolo Abeni cc: linux-afs@lists.infradead.org cc: netdev@vger.kernel.org --- net/rxrpc/key.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/rxrpc/key.c b/net/rxrpc/key.c index 8d53aded09c4..33e8302a79e3 100644 --- a/net/rxrpc/key.c +++ b/net/rxrpc/key.c @@ -680,7 +680,7 @@ static long rxrpc_read(const struct key *key, return -ENOPKG; } - if (WARN_ON((unsigned long)xdr - (unsigned long)oldxdr == + if (WARN_ON((unsigned long)xdr - (unsigned long)oldxdr != toksize)) return -EIO; }