From patchwork Fri Jan 26 11:15:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 1891271 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=suse.cz header.i=@suse.cz header.a=rsa-sha256 header.s=susede2_rsa header.b=XjNXH/zT; dkim=fail reason="signature verification failed" header.d=suse.cz header.i=@suse.cz header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=RnxH2mjE; dkim=fail reason="signature verification failed" (1024-bit key) header.d=suse.cz header.i=@suse.cz header.a=rsa-sha256 header.s=susede2_rsa header.b=DOAUaE0k; dkim=neutral header.d=suse.cz header.i=@suse.cz header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=OQdBDHM2; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=patchwork.ozlabs.org) Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TLw8l1V8mz23f9 for ; Fri, 26 Jan 2024 22:15:19 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 06B3F3D060D for ; Fri, 26 Jan 2024 12:15:16 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-7.smtp.seeweb.it (in-7.smtp.seeweb.it [IPv6:2001:4b78:1:20::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 585863CFA84 for ; Fri, 26 Jan 2024 12:15:13 +0100 (CET) Authentication-Results: in-7.smtp.seeweb.it; spf=pass (sender SPF authorized) smtp.mailfrom=suse.cz (client-ip=2a07:de40:b251:101:10:150:64:2; helo=smtp-out2.suse.de; envelope-from=pvorel@suse.cz; receiver=lists.linux.it) Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2a07:de40:b251:101:10:150:64:2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by in-7.smtp.seeweb.it (Postfix) with ESMTPS id B5FF020075F for ; Fri, 26 Jan 2024 12:15:12 +0100 (CET) Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id EB73F1FD9F; Fri, 26 Jan 2024 11:15:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1706267710; h=from:from:reply-to: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=E5WPD16uh6LHY81Zml51pmF/4NVSqXt7pUD4XJwVNCM=; b=XjNXH/zTXsujdH/YZf0fj2QIQTENgGvkzaGC/bwxyZPn8QxCcAhjY2w03T0tVVoD633J11 ghChbamWBfcP7aDvoOu0wPL3HVsOoafynJeSrAXA1WGEmKQxwRTpfJ1bAq99EAsOszkGR+ sEfgTg9LFkzM9hQGSj3DvKLOFx1hi0w= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1706267710; h=from:from:reply-to: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=E5WPD16uh6LHY81Zml51pmF/4NVSqXt7pUD4XJwVNCM=; b=RnxH2mjET6U7E/4MVKtXCvlg6ojJQwDJuBuV7QTrBhJYAt4M97fzqcuGEd+W+8TkFrvB3z XkBM0GO1gqWAWvBQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1706267709; h=from:from:reply-to: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=E5WPD16uh6LHY81Zml51pmF/4NVSqXt7pUD4XJwVNCM=; b=DOAUaE0kEozZ7jA/iQn0iVqMn0ezSncmcY7t7gBv4pgXRQ1Cccf0tqKhJ1bJjP6JDcYwJ8 Mn6WMLHx6mBzAAASOPYyKWB0IZe3vt+Foyke4nFCDz3p2B5BGwVPdHZuXXWWISLa/E3PnV 2R3HU+MjkgaqMu2qtE4ma3Qy5pBPQl8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1706267709; h=from:from:reply-to: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=E5WPD16uh6LHY81Zml51pmF/4NVSqXt7pUD4XJwVNCM=; b=OQdBDHM2m5a/0xxL1d4uA4+xwzk+VX+BFbRCd9jXkB/w55Ltws/wFvzL5e73Nv4uzdwxFX DIa5NS2haMEDgQBw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id C3A41134C3; Fri, 26 Jan 2024 11:15:09 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap1.dmz-prg2.suse.org with ESMTPSA id OeRcLj2Us2UQMQAAD6G6ig (envelope-from ); Fri, 26 Jan 2024 11:15:09 +0000 From: Petr Vorel To: ltp@lists.linux.it Date: Fri, 26 Jan 2024 12:15:06 +0100 Message-ID: <20240126111506.491324-1-pvorel@suse.cz> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=DOAUaE0k; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=OQdBDHM2 X-Spamd-Result: default: False [0.69 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[suse.cz:s=susede2_rsa,suse.cz:s=susede2_ed25519]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; RCVD_COUNT_THREE(0.00)[3]; DKIM_SIGNED(0.00)[suse.cz:s=susede2_rsa,suse.cz:s=susede2_ed25519]; DKIM_TRACE(0.00)[suse.cz:+]; MX_GOOD(-0.01)[]; MID_CONTAINS_FROM(1.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.cz:dkim,suse.cz:email]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-0.00)[37.35%] X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spam-Score: 0.69 X-Rspamd-Queue-Id: EB73F1FD9F X-Spam-Level: X-Spamd-Bar: / X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=disabled version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-13) on in-7.smtp.seeweb.it X-Virus-Scanned: clamav-milter 1.0.3 at in-7.smtp.seeweb.it X-Virus-Status: Clean Subject: [LTP] [PATCH v2 1/1] lapi/io_uring: => X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" This fixes compilation on old toolchains: Some old toolchains require to add to missing kernel types: tst_safe_io_uring.c: In function ‘safe_io_uring_init’: tst_safe_io_uring.c:34:45: error: ‘__u32’ undeclared (first use in this function) 34 | params->sq_entries * sizeof(__u32); | ^~~~~ io_uring02.c: In function ‘drain_fallback’: io_uring02.c:106:34: error: ‘__u64’ undeclared (first use in this function) 106 | sqe_ptr->addr = (__u64)&spam_header; | ^~~~~ io_uring02.c:106:34: note: each undeclared identifier is reported only once for each function it appears in io_uring02.c: In function ‘run’: io_uring02.c:221:26: error: ‘__u64’ undeclared (first use in this function) 221 | sqe_ptr->addr = (__u64)&beef_header; | ^~~~~ Newer kernel headers includes in , but we still support compilers without this header. Therefore replace in lapi header with . Fixes: 3f2ff5431 ("Add safe functions for io_uring to LTP library") Fixes: c4f669f13 ("Add test for CVE 2020-29373") Signed-off-by: Petr Vorel Reviewed-by: Cyril Hrubis --- Changes v1->v2: * Fix also io_uring02.c include/lapi/io_uring.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/lapi/io_uring.h b/include/lapi/io_uring.h index 03c45190e..c05517595 100644 --- a/include/lapi/io_uring.h +++ b/include/lapi/io_uring.h @@ -11,9 +11,9 @@ #include #include -#include #include #include +#include #include "lapi/syscalls.h"