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 6EA69C433EF for ; Mon, 25 Oct 2021 21:16:33 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 167EB61076 for ; Mon, 25 Oct 2021 21:16:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 167EB61076 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 71F6480007; Mon, 25 Oct 2021 17:16:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6CED1940007; Mon, 25 Oct 2021 17:16:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 56FC880007; Mon, 25 Oct 2021 17:16:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0203.hostedemail.com [216.40.44.203]) by kanga.kvack.org (Postfix) with ESMTP id 459C4940007 for ; Mon, 25 Oct 2021 17:16:32 -0400 (EDT) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id F40F22B36F for ; Mon, 25 Oct 2021 21:16:31 +0000 (UTC) X-FDA: 78736218582.02.E2EF42C Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by imf17.hostedemail.com (Postfix) with ESMTP id A4259F000393 for ; Mon, 25 Oct 2021 21:16:31 +0000 (UTC) Received: by mail-pf1-f174.google.com with SMTP id m14so12161320pfc.9 for ; Mon, 25 Oct 2021 14:16:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=WykFcEu3gun2Q4Ung304wd/4WeKNK4r+geKtd+xDG0A=; b=hWzvmP79GbX+2eowlYcyfK+E8HA2QNjpW0MJuY8fPca5jpPKczyuxL99sDKZ2l+n/X SxAyl0TSq3Ea0DALPnln0NZpNxMYwlTDA5PUU+7iHnGLqD0pZGV4hk9D1ME0tSJXqtXk ZUpoQQOloYhp8IUHhi9LljGkNAk/40P4+klD0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=WykFcEu3gun2Q4Ung304wd/4WeKNK4r+geKtd+xDG0A=; b=25eIyOxJ9bFiNn1dyxq+NCIp3ftlM0KtRLDkjkUtKaB0SntsnriKFsl5byVY3mC6bg tY12MZX6fyZ7H3h+vWlH8ZbEjaELwpH6UfRHVvxZPPEHz4b+WS5boSwP2tAS5FbcbzVQ GqKvYjq5QW+GWPdOAG9jyMRCAT50x+s/TEMDUd45Ky3Gu+/YeTjA+1yLfQ93XVfjQfhk 98Qkb1KQoeG1Ouym0wIO4IrdpyqGMU1P1jc7SLuRIC4T9f2BV1vv/iTH+nNWrLQMX4v/ nf9HjvkmBdAjIECWU7+wgiq9wqw3Br9xBcJPiC6cAWQsXfEyk0XXCUicrAh2lDyg29ik fomQ== X-Gm-Message-State: AOAM532BcA3QCxhDjJ9IyYkwQCeJ0co7l7GlMAosDlAxpa6rbyDnNOvU EMhpwCS4cRNvKQfeSvtNNuNVzw== X-Google-Smtp-Source: ABdhPJxmKiP4mIzK9EfWIWfSZIlru2lTN121HsO8gbDbxDQk4Vut9f2sGsYffv4goiE6GSJh6quc/g== X-Received: by 2002:a62:445:0:b0:44c:3b5b:f680 with SMTP id 66-20020a620445000000b0044c3b5bf680mr21808807pfe.30.1635196590644; Mon, 25 Oct 2021 14:16:30 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id d15sm22785970pfu.12.2021.10.25.14.16.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Oct 2021 14:16:30 -0700 (PDT) Date: Mon, 25 Oct 2021 14:16:29 -0700 From: Kees Cook To: Yafang Shao Cc: akpm@linux-foundation.org, rostedt@goodmis.org, mathieu.desnoyers@efficios.com, arnaldo.melo@gmail.com, pmladek@suse.com, peterz@infradead.org, viro@zeniv.linux.org.uk, valentin.schneider@arm.com, qiang.zhang@windriver.com, robdclark@chromium.org, christian@brauner.io, dietmar.eggemann@arm.com, mingo@redhat.com, juri.lelli@redhat.com, vincent.guittot@linaro.org, davem@davemloft.net, kuba@kernel.org, ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, kafai@fb.com, songliubraving@fb.com, yhs@fb.com, john.fastabend@gmail.com, kpsingh@kernel.org, dennis.dalessandro@cornelisnetworks.com, mike.marciniszyn@cornelisnetworks.com, dledford@redhat.com, jgg@ziepe.ca, linux-rdma@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, oliver.sang@intel.com, lkp@intel.com, Andrii Nakryiko Subject: Re: [PATCH v6 04/12] drivers/infiniband: make setup_ctxt always get a nul terminated task comm Message-ID: <202110251415.9AD37837@keescook> References: <20211025083315.4752-1-laoar.shao@gmail.com> <20211025083315.4752-5-laoar.shao@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211025083315.4752-5-laoar.shao@gmail.com> X-Stat-Signature: t9masdnzb7o9j6n5zb9zpidduzaiu4xe Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=hWzvmP79; spf=pass (imf17.hostedemail.com: domain of keescook@chromium.org designates 209.85.210.174 as permitted sender) smtp.mailfrom=keescook@chromium.org; dmarc=pass (policy=none) header.from=chromium.org X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: A4259F000393 X-HE-Tag: 1635196591-942383 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 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. > ctxt_fp(fp) = rcd; > qib_stats.sps_ctxts++; > dd->freectxts--; > -- > 2.17.1 > -- Kees Cook