From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 38D96C433F5 for ; Tue, 26 Oct 2021 01:53:12 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id CAD5660F9B for ; Tue, 26 Oct 2021 01:53:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org CAD5660F9B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 6B13780007; Mon, 25 Oct 2021 21:53:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6382A940007; Mon, 25 Oct 2021 21:53:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4D9B280007; Mon, 25 Oct 2021 21:53:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0045.hostedemail.com [216.40.44.45]) by kanga.kvack.org (Postfix) with ESMTP id 37C1A940007 for ; Mon, 25 Oct 2021 21:53:11 -0400 (EDT) Received: from smtpin27.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id DFCB02CBCC for ; Tue, 26 Oct 2021 01:53:10 +0000 (UTC) X-FDA: 78736915740.27.E7C6539 Received: from mail-io1-f50.google.com (mail-io1-f50.google.com [209.85.166.50]) by imf05.hostedemail.com (Postfix) with ESMTP id ED41B5088298 for ; Tue, 26 Oct 2021 01:53:00 +0000 (UTC) Received: by mail-io1-f50.google.com with SMTP id h196so18150930iof.2 for ; Mon, 25 Oct 2021 18:53:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=pTf4FChHrUD4zN63gzg0O6ODWycwCgp30B2Xd0Glbns=; b=EWg2KyQmct77jHNB7+PnJsR5QYD0vdGQG84gJNTqxm35zMsLVcN4d4NUAshVPeb0Xu a5c7tarSqasBeJQYH9r5mY8NKwzU3zla+91ow63jEb7FV8hb6VOXvwDWX7rIjm196ic5 tj+uiO6RPpHmP1SfiDg4xSd0u+ECMvc6XqgFWIX7Q1gzlzGSjaTLGpQ0jICGmVt3ej+/ eE+3QE61HjbTv2yTVo3bsR+st1KnKvUsWNfq91bUp5D4eS9PqSJ/LeG0aU3efIlUaydl y3qpBqrRK0evrLS49KyFPfMRUl/cnyWe8uaO9815cS3NRcLREF+xmXXDlOfrOws/VHWq rqaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=pTf4FChHrUD4zN63gzg0O6ODWycwCgp30B2Xd0Glbns=; b=MJPjghyIKmTDgerqATF14iDY43U1RMuK43x+316FCzBzj8QWBr7l+ojztVM1tEgc+y RbAtM5hNtqztcOvr8HplG5lXoOSDgRMOwgC4tWOegqA1Ye1Cd0g2WL8gnLoanhIj1T5m YUFxz+AgLExQq9Ib9WccPaI9wp0y+D4j6Q8en9mcFx1RizWQH2rlTRZiwfKjNke30Uoj meiNde8FHvv90Mm8OvpwqLrSy7JpjQvMLde5g+7K1cmQAf4xamE9iuCJYyl1Hgb/SnHU ifgVWv9uqF9uMa+7ImTYCz4Pq7ubVwdFNiTQhZc8wagDqD+jOnc2uxpAglplK7eonsbf T36w== X-Gm-Message-State: AOAM532rxcAcZ861KuylPDmJuH6d9P3HQUPMq+3DDWvfndM+5cTXmGhB O8YJbNO4Q5ErVde7Ju9iB59VuPPY4Qg3pdWyDIU= X-Google-Smtp-Source: ABdhPJyIryqDVwlMvG5xY1qfmY9kjdTWxMdRzXGeuyZ0FRySrojjoK8/YOgWLBMhL8M3gQrLG+9seph0tIe9uWJHhj0= X-Received: by 2002:a02:a483:: with SMTP id d3mr3861810jam.23.1635213189854; Mon, 25 Oct 2021 18:53:09 -0700 (PDT) MIME-Version: 1.0 References: <20211025083315.4752-1-laoar.shao@gmail.com> <20211025083315.4752-5-laoar.shao@gmail.com> <202110251415.9AD37837@keescook> In-Reply-To: <202110251415.9AD37837@keescook> From: Yafang Shao Date: Tue, 26 Oct 2021 09:52:34 +0800 Message-ID: Subject: Re: [PATCH v6 04/12] drivers/infiniband: make setup_ctxt always get a nul terminated task comm To: Kees Cook Cc: Andrew Morton , Steven Rostedt , Mathieu Desnoyers , Arnaldo Carvalho de Melo , Petr Mladek , Peter Zijlstra , Al Viro , Valentin Schneider , Qiang Zhang , robdclark , christian , Dietmar Eggemann , Ingo Molnar , Juri Lelli , Vincent Guittot , David Miller , Jakub Kicinski , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin Lau , Song Liu , Yonghong Song , john fastabend , KP Singh , dennis.dalessandro@cornelisnetworks.com, mike.marciniszyn@cornelisnetworks.com, dledford@redhat.com, jgg@ziepe.ca, linux-rdma@vger.kernel.org, netdev , bpf , "linux-perf-use." , linux-fsdevel@vger.kernel.org, Linux MM , LKML , kernel test robot , kbuild test robot , Andrii Nakryiko Content-Type: text/plain; charset="UTF-8" X-Stat-Signature: ienky1sc6uqjsysg4mwohtsjh7xe1k1h X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: ED41B5088298 Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=EWg2KyQm; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf05.hostedemail.com: domain of laoar.shao@gmail.com designates 209.85.166.50 as permitted sender) smtp.mailfrom=laoar.shao@gmail.com X-HE-Tag: 1635213180-989568 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Tue, Oct 26, 2021 at 5:16 AM Kees Cook wrote: > > On Mon, Oct 25, 2021 at 08:33:07AM +0000, Yafang Shao wrote: > > Use strscpy_pad() instead of strlcpy() to make the comm always nul > > terminated. As the comment above the hard-coded 16, we can replace it > > with TASK_COMM_LEN, then it will adopt to the comm size change. > > > > Signed-off-by: Yafang Shao > > Cc: Mathieu Desnoyers > > Cc: Arnaldo Carvalho de Melo > > Cc: Andrii Nakryiko > > Cc: Peter Zijlstra > > Cc: Steven Rostedt > > Cc: Al Viro > > Cc: Kees Cook > > Cc: Petr Mladek > > --- > > drivers/infiniband/hw/qib/qib.h | 2 +- > > drivers/infiniband/hw/qib/qib_file_ops.c | 2 +- > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h > > index 9363bccfc6e7..a8e1c30c370f 100644 > > --- a/drivers/infiniband/hw/qib/qib.h > > +++ b/drivers/infiniband/hw/qib/qib.h > > @@ -196,7 +196,7 @@ struct qib_ctxtdata { > > pid_t pid; > > pid_t subpid[QLOGIC_IB_MAX_SUBCTXT]; > > /* same size as task_struct .comm[], command that opened context */ > > - char comm[16]; > > + char comm[TASK_COMM_LEN]; > > /* pkeys set by this use of this ctxt */ > > u16 pkeys[4]; > > /* so file ops can get at unit */ > > diff --git a/drivers/infiniband/hw/qib/qib_file_ops.c b/drivers/infiniband/hw/qib/qib_file_ops.c > > index 63854f4b6524..7ab2b448c183 100644 > > --- a/drivers/infiniband/hw/qib/qib_file_ops.c > > +++ b/drivers/infiniband/hw/qib/qib_file_ops.c > > @@ -1321,7 +1321,7 @@ static int setup_ctxt(struct qib_pportdata *ppd, int ctxt, > > rcd->tid_pg_list = ptmp; > > rcd->pid = current->pid; > > init_waitqueue_head(&dd->rcd[ctxt]->wait); > > - strlcpy(rcd->comm, current->comm, sizeof(rcd->comm)); > > + strscpy_pad(rcd->comm, current->comm, sizeof(rcd->comm)); > > This should use (the adjusted) get_task_comm() instead of leaving this > open-coded. > Sure, that is better. > > ctxt_fp(fp) = rcd; > > qib_stats.sps_ctxts++; > > dd->freectxts--; > > -- > > 2.17.1 > > > > -- > Kees Cook -- Thanks Yafang