From patchwork Thu Feb 9 23:01:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Sorenson X-Patchwork-Id: 9565643 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9D7A260236 for ; Thu, 9 Feb 2017 23:01:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 90DCB28532 for ; Thu, 9 Feb 2017 23:01:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 83E8C28548; Thu, 9 Feb 2017 23:01:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.4 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 223F028532 for ; Thu, 9 Feb 2017 23:01:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752079AbdBIXBZ (ORCPT ); Thu, 9 Feb 2017 18:01:25 -0500 Received: from mail-qt0-f171.google.com ([209.85.216.171]:36098 "EHLO mail-qt0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751262AbdBIXBY (ORCPT ); Thu, 9 Feb 2017 18:01:24 -0500 Received: by mail-qt0-f171.google.com with SMTP id k15so19069333qtg.3 for ; Thu, 09 Feb 2017 15:01:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=Pb4BQPsrBUPXzG0hKk59jH74keGAefre5L1eKqakQ14=; b=evRnNqjnlRf1/CGzfdU4yXWszZ81lFd0newch+2TlfAAJvqC7vWSrnSJM261azWCOi NCg//vvKlJ+2ibBrt/ftk+wO6vbGdz3/Zw9ucmwNIIZMPQnfB/Qx1ok7nu8HrMYWUDrB ylYq+gTFIH/prDCid/xBK09HesqPPoCgvwScCA7Ocdd9vjCepxFVJoz9ehejXAsD4Ora /akbNyf0iZEgAo5p0GXDO/Ez4XSrkKhvI6sblAMqi/gtQGTsdzdd+H7g7+6yFYOc+fF5 wFeQt9n6Vq5LDrk3vogTzAQ7HdA09wmAuzzlKx16iiV/A5K6ph+fAUw0EUE9aWqyqP/I QthQ== X-Gm-Message-State: AMke39kFKh1wQghAKu1IbVAcCD2uPx/pjLGFIB+pAR4IQGt2u5EkD604o9x7iDb1o8Rq6GII X-Received: by 10.200.55.173 with SMTP id d42mr5169363qtc.168.1486681283525; Thu, 09 Feb 2017 15:01:23 -0800 (PST) Received: from hut.sorenson.redhat.com (198-0-247-150-static.hfc.comcastbusiness.net. [198.0.247.150]) by smtp.gmail.com with ESMTPSA id u5sm10459220qkd.46.2017.02.09.15.01.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Feb 2017 15:01:22 -0800 (PST) To: linux-nfs@vger.kernel.org From: Frank Sorenson Subject: [nfs-utils PATCH V2 1/2] Replace non-thread-safe strtok function calls in gssd Message-ID: <911ff1ff-ac59-2c10-e165-cd1186b1f940@redhat.com> Date: Thu, 9 Feb 2017 17:01:22 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.1.0 MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Author: Frank Sorenson Date: 2017-02-09 16:35:51 -0600 gssd: replace non-thread-safe strtok with strsep gssd uses the non-thread-safe strtok() function, which can lead to incorrect program behavior. Replace strtok() with the thread-safe strsep(). Signed-off-by: Frank Sorenson --- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/utils/gssd/gssd_proc.c b/utils/gssd/gssd_proc.c index d74d372..30c6ace 100644 --- a/utils/gssd/gssd_proc.c +++ b/utils/gssd/gssd_proc.c @@ -729,10 +729,11 @@ handle_gssd_upcall(struct clnt_upcall_info *info) char *target = NULL; char *service = NULL; char *enctypes = NULL; + char *pbuf = info->lbuf; printerr(2, "\n%s: '%s' (%s)\n", __func__, info->lbuf, clp->relpath); - for (p = strtok(info->lbuf, " "); p; p = strtok(NULL, " ")) { + while ((p = strsep(&pbuf, " "))) { if (!strncmp(p, "mech=", strlen("mech="))) mech = p + strlen("mech="); else if (!strncmp(p, "uid=", strlen("uid=")))