From patchwork Fri Jul 27 12:30:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Moese X-Patchwork-Id: 950161 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=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.de Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41cSvL2ljKz9ryt for ; Fri, 27 Jul 2018 22:29:17 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id E37F63E7563 for ; Fri, 27 Jul 2018 14:29:13 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-4.smtp.seeweb.it (in-4.smtp.seeweb.it [217.194.8.4]) by picard.linux.it (Postfix) with ESMTP id 404223E7547 for ; Fri, 27 Jul 2018 14:29:12 +0200 (CEST) Received: from mx1.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by in-4.smtp.seeweb.it (Postfix) with ESMTPS id 4C99A10019EF for ; Fri, 27 Jul 2018 14:29:11 +0200 (CEST) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 8EF14AD1B for ; Fri, 27 Jul 2018 12:29:10 +0000 (UTC) From: Michael Moese To: ltp@lists.linux.it Date: Fri, 27 Jul 2018 14:30:14 +0200 Message-Id: <20180727123014.24435-1-mmoese@suse.de> X-Mailer: git-send-email 2.18.0 X-Virus-Scanned: clamav-milter 0.99.2 at in-4.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=-0.0 required=7.0 tests=SPF_PASS autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-4.smtp.seeweb.it Subject: [LTP] [PATCH v3] add new testcase for bind 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" With 0fb44559ffd6 af_unix: move unix_mknod() out of bindlock the behavior of bind() for STREAM UNIX sockets changed in case a socket that is already bound is passed to bind() again. This testcase fails for the new behavior and passes for the old one. Signed-off-by: Michael Moese --- Changes to v2: change to relative socket path and letting the harness handle the temporaty directory Changes to v1: I just cleaned the includes and comments as suggested. --- runtest/syscalls | 1 + testcases/kernel/syscalls/bind/.gitignore | 1 + testcases/kernel/syscalls/bind/bind03.c | 81 +++++++++++++++++++++++ 3 files changed, 83 insertions(+) create mode 100644 testcases/kernel/syscalls/bind/bind03.c diff --git a/runtest/syscalls b/runtest/syscalls index dc72484cb..e8b93a65b 100644 --- a/runtest/syscalls +++ b/runtest/syscalls @@ -29,6 +29,7 @@ asyncio02 asyncio02 bind01 bind01 bind02 bind02 +bind03 bind03 bdflush01 bdflush01 diff --git a/testcases/kernel/syscalls/bind/.gitignore b/testcases/kernel/syscalls/bind/.gitignore index ba46f4fa2..4ebea9ee7 100644 --- a/testcases/kernel/syscalls/bind/.gitignore +++ b/testcases/kernel/syscalls/bind/.gitignore @@ -1,2 +1,3 @@ /bind01 /bind02 +/bind03 diff --git a/testcases/kernel/syscalls/bind/bind03.c b/testcases/kernel/syscalls/bind/bind03.c new file mode 100644 index 000000000..06314a8c0 --- /dev/null +++ b/testcases/kernel/syscalls/bind/bind03.c @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2018 Michael Moese + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ +/* The commit 0fb44559ffd6 af_unix: move unix_mknod() out of bindlock + * changed the behavior of bind() for STREAM UNIX domain sockets if + */ + +#include +#include +#include +#include +#include + +#include "tst_test.h" +#include "tst_safe_net.h" + +#define SNAME "socket.1" + +static int sock1, sock2; + +void run(void) +{ + struct sockaddr_un sun; + + sock1 = SAFE_SOCKET(PF_UNIX, SOCK_STREAM, 0); + + memset(&sun, 0, sizeof(sun)); + sun.sun_family = AF_UNIX; + if (sprintf(sun.sun_path, "%s", SNAME) < (int) strlen(SNAME)) { + tst_res(TFAIL, "sprintf failed"); + return; + } + + SAFE_BIND(sock1, (struct sockaddr *)&sun, sizeof(sun)); + + /* + * Once a STREAM UNIX domain socket has been bound, it can't be + * rebound. Expected error is EINVAL. + */ + if (bind(sock1, (struct sockaddr *)&sun, sizeof(sun)) == 0) { + tst_res(TFAIL, "re-binding of socket succeeded"); + return; + } + + if (errno != EINVAL) { + tst_res(TFAIL | TERRNO, "expected EINVAL"); + return; + } + + sock2 = SAFE_SOCKET(PF_UNIX, SOCK_STREAM, 0); + + /* + * Since a socket is already bound to the pathname, it can't be bound + * to a second socket. Expected error is EADDRINUSE. + */ + if (bind(sock2, (struct sockaddr *)&sun, sizeof(sun)) == 0) { + tst_res(TFAIL, "bind() succeeded with already bound pathname!"); + return; + } + + if (errno != EADDRINUSE) { + tst_res(TFAIL | TERRNO, "expected to fail with EADDRINUSE"); + return; + } + + tst_res(TPASS, "bind() failed with EADDRINUSE as expected"); +} + +static void cleanup(void) +{ + close(sock1); + close(sock2); +} + +static struct tst_test test = { + .cleanup = cleanup, + .test_all = run, + .needs_tmpdir = 1, +};