From patchwork Sat Mar 3 00:09:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hackmann X-Patchwork-Id: 881352 X-Patchwork-Delegate: petr.vorel@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.linux.it (client-ip=213.254.12.146; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="j/fLTXdZ"; dkim-atps=neutral Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zvv5m5pKYz9s3L for ; Mon, 5 Mar 2018 20:01:16 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 229723E6CD1 for ; Mon, 5 Mar 2018 10:01:11 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-6.smtp.seeweb.it (in-6.smtp.seeweb.it [IPv6:2001:4b78:1:20::6]) by picard.linux.it (Postfix) with ESMTP id 9694E3E76D6 for ; Sat, 3 Mar 2018 01:10:05 +0100 (CET) Received: from mail-pl0-x243.google.com (mail-pl0-x243.google.com [IPv6:2607:f8b0:400e:c01::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by in-6.smtp.seeweb.it (Postfix) with ESMTPS id 796281400DB4 for ; Sat, 3 Mar 2018 01:10:04 +0100 (CET) Received: by mail-pl0-x243.google.com with SMTP id i6-v6so6581042plt.7 for ; Fri, 02 Mar 2018 16:10:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=22kHJyBt6Tb69O9fUpYt+3aQIyDVGPajQ9ru6AFgfBI=; b=j/fLTXdZPg9IfaMvAcs+6AO8XCIG2isQ7rChzZAFAYChq99EWWfREDE0UmeXA6a9BW uCNcf7ADsMPcBDppJ3E8+1bZ+9rmoJLtM2xnTZSqiXP17qaRuYqdq6ewRuEYb4YqIzoY GrkeiA606QkdbB8F3z174/F+lDEXMILiCA6q1lhv6ioaR5Ok87czZRm8HFh0JFE3vCqE qH1afvYeFt179LgVSvIrkrFlFXg/nl9zS0yiL09rICpNB/briOTlos7nzkMTzLDeSHgz bj1ZK+jFafbVdaUNgItpPZgiwTOP0qDBFCYdPwfegNHMXLG6UgEKcfJUHX7eQusL+Vpk Autg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=22kHJyBt6Tb69O9fUpYt+3aQIyDVGPajQ9ru6AFgfBI=; b=DGxYkGWdboWUo/IgWiecvSR0ftA1jHxUz7e8DChXs5A2osN4Fc2LgZJXTY2TLg6Lww kfiPmgFvYCVArxmPRIw2W4GkLNc4E1P5a/O8PP0mNBLW/qCGXhHBfMrV+OB9WIjTtTCx TrsJLAgX3uBaMvX6w41hJvbtvgOE/Ja/aGVORYzSDcK5mkcoFKd/QVVGyeUyjvnH0ZLH FFMkBKlMofFBVy8RS5WQJ2r2a2lusiwkXPLRUs9xaqbE1mhZNGDX1jzcX0+MlG4MAJb5 9C+gk26459vleLEg//3pVBm9uCFO5josncq6tCvxu/nYfucVSgZ6h/2KCY5YbF8MKoDV g+UA== X-Gm-Message-State: APf1xPB+X/ogu56kC1J24beAXODPtMf1gF2V/d76ZLgTJqD4QzWZxuSA xLkvsf56DEO4QSS4IU7ZTkwTB8fN6oc= X-Google-Smtp-Source: AG47ELtu2+ZQmLi6MyidaEYw3mjb231h3YSZ9budeAGSGBlSkk6jzodQ83XRh05kL2ODXCpS7fHofQ== X-Received: by 2002:a17:902:467:: with SMTP id 94-v6mr6653413ple.57.1520035802606; Fri, 02 Mar 2018 16:10:02 -0800 (PST) Received: from hackmann.mtv.corp.google.com ([2620:0:1000:1601:82f7:8f1:8c08:a97a]) by smtp.gmail.com with ESMTPSA id g80sm14960284pfj.101.2018.03.02.16.10.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Mar 2018 16:10:01 -0800 (PST) From: Greg Hackmann To: ltp@lists.linux.it Date: Fri, 2 Mar 2018 16:09:47 -0800 Message-Id: <20180303000947.76487-1-ghackmann@google.com> X-Mailer: git-send-email 2.16.2.395.g2e18187dfd-goog X-Virus-Scanned: clamav-milter 0.99.2 at in-6.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, SPF_PASS, T_RP_MATCHES_RCVD autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-6.smtp.seeweb.it X-Mailman-Approved-At: Mon, 05 Mar 2018 10:01:09 +0100 Subject: [LTP] [PATCH] syscalls/connect01: bypass bionic connect() implementation X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" The connect01 test segfaults on Android when it gets to the second testcase. bionic's connect() implementation hooks into the netd client library, which in turn expects addr to be a valid pointer. Work around this by directly calling the kernel connect syscall. Signed-off-by: Greg Hackmann --- testcases/kernel/syscalls/connect/connect01.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/testcases/kernel/syscalls/connect/connect01.c b/testcases/kernel/syscalls/connect/connect01.c index 2be83cfbb..e9b9c7945 100644 --- a/testcases/kernel/syscalls/connect/connect01.c +++ b/testcases/kernel/syscalls/connect/connect01.c @@ -116,6 +116,23 @@ int TST_TOTAL = sizeof(tdat) / sizeof(tdat[0]); static char *argv0; #endif +#ifdef __BIONIC__ +/** + * bionic's connect() implementation calls netdClientInitConnect() before + * sending the request to the kernel. We need to bypass this, or the test will + * segfault during the addr = (struct sockaddr *)-1 testcase. + */ +#include "lapi/syscalls.h" + +static int sys_connect(int sockfd, const struct sockaddr *addr, + socklen_t addrlen) +{ + return ltp_syscall(__NR_connect, sockfd, addr, addrlen); +} + +#define connect(sockfd, addr, addrlen) sys_connect(sockfd, addr, addrlen) +#endif + int main(int argc, char *argv[]) { int lc;