From patchwork Mon Jul 18 13:34:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dylan Yudaken X-Patchwork-Id: 12921289 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 67618C433EF for ; Mon, 18 Jul 2022 13:34:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230182AbiGRNet (ORCPT ); Mon, 18 Jul 2022 09:34:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229640AbiGRNet (ORCPT ); Mon, 18 Jul 2022 09:34:49 -0400 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C6C9319C17 for ; Mon, 18 Jul 2022 06:34:48 -0700 (PDT) Received: from pps.filterd (m0148461.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 26HNs71Q017139 for ; Mon, 18 Jul 2022 06:34:48 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=facebook; bh=skKW5lecG5UJMyYQlcRl3AZpJeI32OEzD6WreotObqg=; b=EU5gUlhTGOd6Ox1vkrkz7kOhucAX17gehdWRVC2T9Nulj7EeB20ZsxYHdhpnrBOwvIcd HvkkE/BWQaRAQrs5sLYbiXV57HWjg4RELxAeQKmKpVReToBs9xb6ybzzF+je8VgZzJ3J asuHOsU5AOfA8E3fz27C4C+Q65qUpj967MA= Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3hbtetgw91-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 18 Jul 2022 06:34:48 -0700 Received: from snc-exhub201.TheFacebook.com (2620:10d:c085:21d::7) by snc-exhub203.TheFacebook.com (2620:10d:c085:21d::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Mon, 18 Jul 2022 06:34:47 -0700 Received: from twshared22934.08.ash9.facebook.com (2620:10d:c085:208::11) by mail.thefacebook.com (2620:10d:c085:21d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Mon, 18 Jul 2022 06:34:47 -0700 Received: by devbig038.lla2.facebook.com (Postfix, from userid 572232) id 259B13319DD8; Mon, 18 Jul 2022 06:34:36 -0700 (PDT) From: Dylan Yudaken To: , CC: , , Dylan Yudaken Subject: [PATCH liburing] fix io_uring_recvmsg_cmsg_nexthdr logic Date: Mon, 18 Jul 2022 06:34:29 -0700 Message-ID: <20220718133429.726628-1-dylany@fb.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-GUID: imGtum2gjjvwJYNjuCfguqJOoodAnVeM X-Proofpoint-ORIG-GUID: imGtum2gjjvwJYNjuCfguqJOoodAnVeM X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-07-18_12,2022-07-18_01,2022-06-22_01 Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org io_uring_recvmsg_cmsg_nexthdr was using the payload to delineate the end of the cmsg list, but really it needs to use whatever was returned by the kernel. Reported-by: Jens Axboe Fixes: 874406f ("add multishot recvmsg API") Signed-off-by: Dylan Yudaken --- src/include/liburing.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/include/liburing.h b/src/include/liburing.h index 583b917..fc7613d 100644 --- a/src/include/liburing.h +++ b/src/include/liburing.h @@ -745,7 +745,8 @@ io_uring_recvmsg_cmsg_nexthdr(struct io_uring_recvmsg_out *o, struct msghdr *m, if (cmsg->cmsg_len < sizeof(struct cmsghdr)) return NULL; - end = (unsigned char *) io_uring_recvmsg_payload(o, m); + end = (unsigned char *) io_uring_recvmsg_cmsg_firsthdr(o, m) + + o->controllen; cmsg = (struct cmsghdr *)((unsigned char *) cmsg + CMSG_ALIGN(cmsg->cmsg_len));