Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp4681268iob; Sun, 8 May 2022 21:48:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxRPrZri+OwQgSPV29mYUcZ0pIibjQgI5an77y3v9Mlsgou0VXO1wnweK8ZfgKhd55jGfy4 X-Received: by 2002:a65:6b8e:0:b0:39d:6761:300f with SMTP id d14-20020a656b8e000000b0039d6761300fmr12085365pgw.42.1652071707964; Sun, 08 May 2022 21:48:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652071707; cv=none; d=google.com; s=arc-20160816; b=mO1w9TQ4RR01e4lpX6PDBtMc69RgvY1dxH8VI1IqYqNsjCVWrq4Hs6LGCflhldxVh6 hrFnufWqaCzvn034NLxs5T7xfLkYvHh+18aCj95pvKY4pZBRgKJQrLatYLCft/r3p9Ai VXIWwNSzhtqJ5CJO1EBuJ6zymSxe/G9XSXNZuYMXS/izi9CMRvNZcs8AVgSLGv9cSqNd nfgestW7xUkPHhqtnVNcdPdoMLr/HKReZ3DVdqQU68xjsZsna5aaemO8sAOIKCzbYiwv 2DxTP2i1zxB2mjr662on8AK8W64RzmtTXOvPwkVWZhrPRlEus8/Y92keHfUMi52KTLkf XHKA== 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=gCaSxJHjcOP33vp9Rn4uuFZeGMQxkcfaeMhil+extgA=; b=k8pR9k75HESxKh1CUeSKyNC+H7sy0mcU2zIDtxmSLYaIS0/SzGjcjN3NtLhvq4+2b6 hEy0NMpnd2/SdTBGvnaBNdNufLXrjp9O0Eldm21F4S1C5X5pPqmhobMLzNKTaFOUT5st 8WaB/sSiPeWpd6h/xq1/3T9GhCrm2PvDE4s6lKl4uKMbaLNcHNv2pqgp9bbJr5eECFnC vy3CCzdfug2qOuBcZ+1Z5muuFE0rtKeEzfpf2/zgXh6gGUjENwiNyapFDp0krhHFVZjX lHoVtTDQuhsn4IJgIrfEy2WLVmkNCr5zCTX29Y6oQE1U3z4LixXxgTqDyDLmcoA1Rs15 u+Dg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=K3FKZWwD; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 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 lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id ob9-20020a17090b390900b001dc681e0252si16077336pjb.5.2022.05.08.21.48.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 May 2022 21:48:27 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=K3FKZWwD; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 69A5B1312B5; Sun, 8 May 2022 21:46:46 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376719AbiEDRzL (ORCPT + 99 others); Wed, 4 May 2022 13:55:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55504 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357057AbiEDROq (ORCPT ); Wed, 4 May 2022 13:14:46 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 36F7454180; Wed, 4 May 2022 09:58:19 -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 57422617A6; Wed, 4 May 2022 16:57:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A36B9C385A4; Wed, 4 May 2022 16:57:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683476; bh=pPUIlAMOVYe9srKo2SbyhxPjEu2zN8+V4ndrRz4piyc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K3FKZWwDbgEz9DNS0mr8us0dSrX6QhkIdREvw53ij7dqIjSrhtdFEpj/UEyNFpc54 DDxwgvdqtYohAN34k0PZc5X7PYpdE+lmqxNoLDabghLwI7aAYM81saGoN+zdhbiFd8 ab4mBtFXIGQ16UeWUzrmf5M3esbRZx8wC9+Bcl7c= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jens Axboe , Sasha Levin Subject: [PATCH 5.17 138/225] io_uring: check reserved fields for recv/recvmsg Date: Wed, 4 May 2022 18:46:16 +0200 Message-Id: <20220504153122.566841289@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504153110.096069935@linuxfoundation.org> References: <20220504153110.096069935@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=-2.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_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 From: Jens Axboe [ Upstream commit 5a1e99b61b0c81388cde0c808b3e4173907df19f ] We should check unused fields for non-zero and -EINVAL if they are set, making it consistent with other opcodes. Fixes: aa1fa28fc73e ("io_uring: add support for recvmsg()") Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- fs/io_uring.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/io_uring.c b/fs/io_uring.c index 107bce75131e..531d0086d0b3 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -5103,6 +5103,8 @@ static int io_recvmsg_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) if (unlikely(req->ctx->flags & IORING_SETUP_IOPOLL)) return -EINVAL; + if (unlikely(sqe->addr2 || sqe->file_index)) + return -EINVAL; sr->umsg = u64_to_user_ptr(READ_ONCE(sqe->addr)); sr->len = READ_ONCE(sqe->len); -- 2.35.1