From patchwork Mon Sep 17 14:11:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rainer Orth X-Patchwork-Id: 29420 Received: (qmail 68063 invoked by alias); 17 Sep 2018 14:11:43 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 68047 invoked by uid 89); 17 Sep 2018 14:11:43 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-19.8 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY autolearn=ham version=3.3.2 spammy=unnecessarily, sprintf, procfsc, procfs.c X-HELO: smtp.CeBiTec.Uni-Bielefeld.DE Received: from smtp.CeBiTec.Uni-Bielefeld.DE (HELO smtp.CeBiTec.Uni-Bielefeld.DE) (129.70.160.84) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 17 Sep 2018 14:11:41 +0000 Received: from localhost (localhost.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) by smtp.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id D6D6CCD6 for ; Mon, 17 Sep 2018 16:11:38 +0200 (CEST) Received: from smtp.CeBiTec.Uni-Bielefeld.DE ([127.0.0.1]) by localhost (malfoy.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 5-D6m-FIRQeh for ; Mon, 17 Sep 2018 16:11:36 +0200 (CEST) Received: from lokon.CeBiTec.Uni-Bielefeld.DE (lokon.CeBiTec.Uni-Bielefeld.DE [129.70.161.152]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTPS id 66ABBCD5 for ; Mon, 17 Sep 2018 16:11:36 +0200 (CEST) Received: (from ro@localhost) by lokon.CeBiTec.Uni-Bielefeld.DE (8.15.2+Sun/8.15.2/Submit) id w8HEBaCV018660; Mon, 17 Sep 2018 16:11:36 +0200 (MEST) From: Rainer Orth To: gdb-patches@sourceware.org Subject: [PATCH] Fix /proc pathname sizes on Solaris Date: Mon, 17 Sep 2018 16:11:35 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (usg-unix-v) MIME-Version: 1.0 X-IsSubscribed: yes I'm slowly working my way through the gdb patches from the solaris-userland repo https://github.com/oracle/solaris-userland/tree/master/components/gdb/patches Some of them are pretty obvious and should be able to go in (such as this one and the next), while others are either incomplete (e.g. 008-syscalls.patch, which adds XML descriptions of the Solaris syscalls, but lacks their registration) or inappropriate in their current form (unnecessarily intrusive). This one (001-fix-proc-name-size.patch) should be obvious given the patches' comment: # In Solaris, PID_MAX is 999999 (6 digit pid). # In Solaris, lwpid_t is an unsigned int, so theoretically the lwp id # could be 10 digits. Two questions about procedure here: * AFAIK Oracle has a corporate copyright assignment on file, so the patches should be covered. Even if that were not the case, this one and the next are certainly below the 15-line limit for non-trivial patches. * Given the code isn't mine, how should we handle attribution? I suspect the engineer who committed the patch to github is the author, but don't know for certain. Should I attribute it to her in the ChangeLog? Tested on i386-pc-solaris2.11. Ok for master? Rainer # HG changeset patch # Parent e6140f0a7128422be8a7e2a148da8de516d676d8 Fix /proc pathname sizes on Solaris diff --git a/gdb/procfs.c b/gdb/procfs.c --- a/gdb/procfs.c +++ b/gdb/procfs.c @@ -233,7 +233,7 @@ enum { READ_WATCHFLAG = WA_READ, #define AS_PROC_NAME_FMT "/proc/%d/as" #define MAP_PROC_NAME_FMT "/proc/%d/map" #define STATUS_PROC_NAME_FMT "/proc/%d/status" -#define MAX_PROC_NAME_SIZE sizeof("/proc/99999/lwp/8096/lstatus") +#define MAX_PROC_NAME_SIZE sizeof("/proc/999999/lwp/0123456789/lwpstatus") typedef struct procinfo { struct procinfo *next; @@ -483,7 +483,7 @@ create_procinfo (int pid, int tid) } else { - sprintf (pi->pathname, "/proc/%05d/lwp/%d", pid, tid); + sprintf (pi->pathname, "/proc/%d/lwp/%d", pid, tid); pi->next = parent->thread_list; parent->thread_list = pi; }