Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/807116/?format=api
{ "id": 807116, "url": "http://patchwork.ozlabs.org/api/patches/807116/?format=api", "web_url": "http://patchwork.ozlabs.org/project/glibc/patch/20170829143037.24231-1-christian.brauner@ubuntu.com/", "project": { "id": 41, "url": "http://patchwork.ozlabs.org/api/projects/41/?format=api", "name": "GNU C Library", "link_name": "glibc", "list_id": "libc-alpha.sourceware.org", "list_email": "libc-alpha@sourceware.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20170829143037.24231-1-christian.brauner@ubuntu.com>", "list_archive_url": null, "date": "2017-08-29T14:30:36", "name": "[1/2,v5] openpty: close slave pty fd on error", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "c37f8f7aebf855d6981f7986fcb4969505076ca8", "submitter": { "id": 72235, "url": "http://patchwork.ozlabs.org/api/people/72235/?format=api", "name": "Christian Brauner", "email": "christian.brauner@ubuntu.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/glibc/patch/20170829143037.24231-1-christian.brauner@ubuntu.com/mbox/", "series": [ { "id": 379, "url": "http://patchwork.ozlabs.org/api/series/379/?format=api", "web_url": "http://patchwork.ozlabs.org/project/glibc/list/?series=379", "date": "2017-08-29T14:30:37", "name": "[1/2,v5] openpty: close slave pty fd on error", "version": 5, "mbox": "http://patchwork.ozlabs.org/series/379/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/807116/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/807116/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<libc-alpha-return-83828-incoming=patchwork.ozlabs.org@sourceware.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "mailing list libc-alpha@sourceware.org" ], "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=sourceware.org\n\t(client-ip=209.132.180.131; helo=sourceware.org;\n\tenvelope-from=libc-alpha-return-83828-incoming=patchwork.ozlabs.org@sourceware.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org; dkim=pass (1024-bit key;\n\tsecure) header.d=sourceware.org header.i=@sourceware.org\n\theader.b=\"djkz/4EA\"; dkim-atps=neutral", "sourceware.org; auth=none" ], "Received": [ "from sourceware.org (server1.sourceware.org [209.132.180.131])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xhWKX1CMWz9t3F\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 30 Aug 2017 00:31:27 +1000 (AEST)", "(qmail 117582 invoked by alias); 29 Aug 2017 14:31:09 -0000", "(qmail 115858 invoked by uid 89); 29 Aug 2017 14:31:03 -0000" ], "DomainKey-Signature": "a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id\n\t:list-unsubscribe:list-subscribe:list-archive:list-post\n\t:list-help:sender:from:to:cc:subject:date:message-id:in-reply-to\n\t:references; q=dns; s=default; b=SIGBnxDepvYi+j76X7sLH8witUMvm12\n\t6ctjb++p8B2udG8SeQ8f6FP7KUl2Vk9VfeULeKJZp4zG9XrkB9yCVGhb7Tn5xlAY\n\tt7p9cDZh0KJK6JqzUc1rfkbnGF2isGdQqdK9U9q5MKvYulmX87t8n1AbihT/GWAc\n\t59W99qRuwQnU=", "DKIM-Signature": "v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id\n\t:list-unsubscribe:list-subscribe:list-archive:list-post\n\t:list-help:sender:from:to:cc:subject:date:message-id:in-reply-to\n\t:references; s=default; bh=hTkz6sZNvpvJnIi/8OFU7Tf0mmE=; b=djkz/\n\t4EADZqPgvK7LnYsX5SHHSJyPNo4+qdRvL5OMbCZPmiDqrYl7fq5hQRiOMoQjyAYX\n\tKhkmAwuKK6Mw5kMsUx04vBdt1ZOY1BUNztsJlTkz7QTOpsnUjrAsHueiO6/Wiq07\n\tqWwKiQ8Pz9PYBxHwENRqt9A+rg21Yo3J3bny3A=", "Mailing-List": "contact libc-alpha-help@sourceware.org; run by ezmlm", "Precedence": "bulk", "List-Id": "<libc-alpha.sourceware.org>", "List-Unsubscribe": "<mailto:libc-alpha-unsubscribe-incoming=patchwork.ozlabs.org@sourceware.org>", "List-Subscribe": "<mailto:libc-alpha-subscribe@sourceware.org>", "List-Archive": "<http://sourceware.org/ml/libc-alpha/>", "List-Post": "<mailto:libc-alpha@sourceware.org>", "List-Help": "<mailto:libc-alpha-help@sourceware.org>,\n\t<http://sourceware.org/ml/#faqs>", "Sender": "libc-alpha-owner@sourceware.org", "X-Virus-Found": "No", "X-Spam-SWARE-Status": "No, score=-26.6 required=5.0 tests=AWL, BAYES_00,\n\tGIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3,\n\tKAM_LAZY_DOMAIN_SECURITY,\n\tRCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 spammy=(unknown)", "X-HELO": "mx2.mailbox.org", "From": "Christian Brauner <christian.brauner@ubuntu.com>", "To": "libc-alpha@sourceware.org, fweimer@redhat.com, joseph@codesourcery.com,\n\tschwab@suse.de", "Cc": "Christian Brauner <christian.brauner@ubuntu.com>", "Subject": "[PATCH 1/2 v5] openpty: close slave pty fd on error", "Date": "Tue, 29 Aug 2017 16:30:36 +0200", "Message-Id": "<20170829143037.24231-1-christian.brauner@ubuntu.com>", "In-Reply-To": "<mvma82ijwxx.fsf@suse.de>", "References": "<mvma82ijwxx.fsf@suse.de>" }, "content": "When openpty() failed only the master fd was closed so far. Let's close the\nslave fd as well. Also, let's unify the error handling.\n\nSigned-off-by: Christian Brauner <christian.brauner@ubuntu.com>\n---\nChangelog 2017-08-29:\n* Unify error handling: use a common function exit that frees everything that\n needs freeing. (@Florian)\nChangelog 2017-08-29:\n* Do not be stupid and only close the file descriptors on error! Duh. (Thanks,\n @Andreas)\n---\n ChangeLog | 4 ++++\n login/openpty.c | 30 ++++++++++++++++--------------\n 2 files changed, 20 insertions(+), 14 deletions(-)", "diff": "diff --git a/ChangeLog b/ChangeLog\nindex bc1cf94dc3..bc5fb8e27f 100644\n--- a/ChangeLog\n+++ b/ChangeLog\n@@ -1,3 +1,7 @@\n+2017-08-26 Christian Brauner <christian.brauner@ubuntu.com>\n+\n+\t* login/openpty.c (openpty): Close slave pty file descriptor on error.\n+\n 2017-08-25 H.J. Lu <hongjiu.lu@intel.com>\n \n \t* sysdeps/x86/cpu-features.h [__ASSEMBLER__]\ndiff --git a/login/openpty.c b/login/openpty.c\nindex 41ab0483e2..9e556c27a5 100644\n--- a/login/openpty.c\n+++ b/login/openpty.c\n@@ -92,29 +92,24 @@ openpty (int *amaster, int *aslave, char *name,\n char _buf[512];\n #endif\n char *buf = _buf;\n- int master, slave;\n+ int master, ret = -1, slave = -1;\n \n master = getpt ();\n if (master == -1)\n return -1;\n \n if (grantpt (master))\n- goto fail;\n+ goto on_error;\n \n if (unlockpt (master))\n- goto fail;\n+ goto on_error;\n \n if (pts_name (master, &buf, sizeof (_buf)))\n- goto fail;\n+ goto on_error;\n \n slave = open (buf, O_RDWR | O_NOCTTY);\n if (slave == -1)\n- {\n- if (buf != _buf)\n-\tfree (buf);\n-\n- goto fail;\n- }\n+ goto on_error;\n \n /* XXX Should we ignore errors here? */\n if (termp)\n@@ -129,12 +124,19 @@ openpty (int *amaster, int *aslave, char *name,\n if (name != NULL)\n strcpy (name, buf);\n \n+ ret = 0;\n+\n+ on_error:\n+ if (ret == -1) {\n+ close (master);\n+\n+ if (slave != -1)\n+ close (slave);\n+ }\n+\n if (buf != _buf)\n free (buf);\n- return 0;\n \n- fail:\n- close (master);\n- return -1;\n+ return ret;\n }\n libutil_hidden_def (openpty)\n", "prefixes": [ "1/2", "v5" ] }