From patchwork Fri Jul 7 09:12:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 117057 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp3153556vqx; Fri, 7 Jul 2023 03:09:16 -0700 (PDT) X-Google-Smtp-Source: APBJJlFrpGZ12otylHPfsE9LMgCzOE+3zzNfr7VD5Sx/faXUzPVzb9fLV/PvWv2TIG3KHnVTSLjB X-Received: by 2002:a9d:7d82:0:b0:6b8:68ac:f7f1 with SMTP id j2-20020a9d7d82000000b006b868acf7f1mr3787003otn.8.1688724555927; Fri, 07 Jul 2023 03:09:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688724555; cv=none; d=google.com; s=arc-20160816; b=A6uGIW4UVDPvtcYtIwiOUEWtPeET5VkReaBDBlYJ+/qEjovxFWif76vnMjsP8VWsCf PhpYAGEzYBAn8W2lncwflJ2QxnAIhugocq4CC8C3LGclcv+pRGIaVXcpv+ou6Po5pEqB p7/FNlJU8tJUhQYX+wi1CuqHOHIU4T3oOA21yAc9bCg/Fl7/RGxJL+575Awwjc+mO9+5 NCyDLP8KnUF309bpcx3fWssxwT6wvspKUgdZswztOdhCo9SMoB7eT/SpPcnDb9vwv+a3 5bt4qrSFfPkHNOox8Y7ccA1sY4ozJrySyGuepv+0AqbGH4jZ7LuBH7UB9J4IdJHqHM1/ V9+g== 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-transfer-encoding :content-id:mime-version:subject:cc:to:from:organization :dkim-signature; bh=wU3D20g/JxtCROQUSiRgjpayIvu8cn+paX5zco5nOco=; fh=rj9rFGOLEY+NU6XqvIWq5warMJ0dLuyf9oSN2aniU/M=; b=mnKsOOW2SF7ontcPepknrz/y1ukjZZlTedzcKn+0suEvwqFTdRtV78Yd0C56AshRpS atlutixOoJy9SATkJkJdd9zNPbHknfZpgrBUlH2kZqY6VsgC9bVKNpgMiXQnjYbggJg6 3luPEPOAvdNKnrVcRWfmAKeLmlVjeO+x2eyYsiDvQj3UIjcUh6Ctp/HE18/zks3HUOMJ SCZ+bpwaUnWdx2DoMCbO4Q7zcOfz2Nflf88WPzjJ2HvC38OeFeJXPLH64/UU4Qtnyu4D OlIw8dFCFL2wZll9T/eou2rXxL0RLrph1wrgqCjoZiCQzaHr6mKJr8Dxc+W3hteWJiWk jyLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=dvjxTtwX; 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 i4-20020a63e444000000b0055bc30ae086si3500743pgk.594.2023.07.07.03.08.58; Fri, 07 Jul 2023 03:09:15 -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=dvjxTtwX; 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 S232637AbjGGJN7 (ORCPT + 99 others); Fri, 7 Jul 2023 05:13:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46438 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229910AbjGGJN5 (ORCPT ); Fri, 7 Jul 2023 05:13:57 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 76ACB1FEE for ; Fri, 7 Jul 2023 02:13:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1688721189; 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: content-transfer-encoding:content-transfer-encoding; bh=wU3D20g/JxtCROQUSiRgjpayIvu8cn+paX5zco5nOco=; b=dvjxTtwXU0X/4Lz1ULa7h30IccpVDwKrqNjjpGWRB6PQmnSBMW1/I3bECf/zNw359NWM2x jptJRjRaN2oqqS+pF/VIojm0inJbXmNvFIZPH29lOKy9n8P1TWyyfWf6RgT4HlknO+afj6 epcAc1k+5zgXtlo3ncQisprHCiEJ8EY= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-136-aTE9Asg2OD6HYPoA1q_yrQ-1; Fri, 07 Jul 2023 05:12:41 -0400 X-MC-Unique: aTE9Asg2OD6HYPoA1q_yrQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8C79483FC20; Fri, 7 Jul 2023 09:12:40 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.42.28.195]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3DAD64067A00; Fri, 7 Jul 2023 09:12:39 +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: Herbert Xu cc: dhowells@redhat.com, syzbot , Paolo Abeni , "David S. Miller" , Eric Dumazet , Jakub Kicinski , linux-crypto@vger.kernel.org, netdev@vger.kernel.org, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] crypto: algif/hash: Fix race between MORE and non-MORE sends MIME-Version: 1.0 Content-ID: <2227987.1688721158.1@warthog.procyon.org.uk> Date: Fri, 07 Jul 2023 10:12:38 +0100 Message-ID: <2227988.1688721158@warthog.procyon.org.uk> X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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_H4,RCVD_IN_MSPIKE_WL,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?1770756039847110095?= X-GMAIL-MSGID: =?utf-8?q?1770756039847110095?= The 'MSG_MORE' state of the previous sendmsg() is fetched without the socket lock held, so two sendmsg calls can race. This can be seen with a large sendfile() as that now does a series of sendmsg() calls, and if a write() comes in on the same socket at an inopportune time, it can flip the state. Fix this by moving the fetch of ctx->more inside the socket lock. Fixes: c662b043cdca ("crypto: af_alg/hash: Support MSG_SPLICE_PAGES") Reported-by: syzbot+689ec3afb1ef07b766b2@syzkaller.appspotmail.com Link: https://lore.kernel.org/r/000000000000554b8205ffdea64e@google.com/ Signed-off-by: David Howells Tested-by: syzbot+689ec3afb1ef07b766b2@syzkaller.appspotmail.com cc: Herbert Xu cc: Paolo Abeni cc: "David S. Miller" cc: Eric Dumazet cc: Jakub Kicinski cc: linux-crypto@vger.kernel.org cc: netdev@vger.kernel.org --- crypto/algif_hash.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/crypto/algif_hash.c b/crypto/algif_hash.c index 0ab43e149f0e..82c44d4899b9 100644 --- a/crypto/algif_hash.c +++ b/crypto/algif_hash.c @@ -68,13 +68,15 @@ static int hash_sendmsg(struct socket *sock, struct msghdr *msg, struct hash_ctx *ctx = ask->private; ssize_t copied = 0; size_t len, max_pages, npages; - bool continuing = ctx->more, need_init = false; + bool continuing, need_init = false; int err; max_pages = min_t(size_t, ALG_MAX_PAGES, DIV_ROUND_UP(sk->sk_sndbuf, PAGE_SIZE)); lock_sock(sk); + continuing = ctx->more; + if (!continuing) { /* Discard a previous request that wasn't marked MSG_MORE. */ hash_free_result(sk, ctx);