From patchwork Wed May 10 09:42:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Po-Hsu Lin X-Patchwork-Id: 760519 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3wNB9h3PQmz9s0m; Wed, 10 May 2017 19:42:48 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical-com.20150623.gappssmtp.com header.i=@canonical-com.20150623.gappssmtp.com header.b="V2E0xDlK"; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1d8O8r-0008Dn-Gd; Wed, 10 May 2017 09:42:45 +0000 Received: from mail-pf0-f173.google.com ([209.85.192.173]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1d8O8e-00089m-QK for kernel-team@lists.ubuntu.com; Wed, 10 May 2017 09:42:32 +0000 Received: by mail-pf0-f173.google.com with SMTP id e193so13387343pfh.0 for ; Wed, 10 May 2017 02:42:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=YbktVFy1ROaiWmtfYna6HNHTUj5/kbPnNNq3248Kr30=; b=V2E0xDlK6decX+4PFmMDRohUk7PEkxlQFOfY3zkagMskP/OdMS1LHh7t9cU2/1r872 ANPVBHFhbApJe8607gxhoIBc/qqvJ9l1DBOJrAJUcXqHP6g/c/BcagnMHzJudRHcUwVD iGgC9HahKqHU2YJ3GbgVdOaeKdlqMtE1Rh8g7U62Um95O7HSCfYnGHtHB1LyA8OKuaWV P/O7ucpbAgMS6nlp98Q8aH0fVdELEVoxTTyFxuy+Rqo+FfOIXANzvuI2mX5mzBR61/su KCytZZd6uy4CtzLs6IcKQQxx0aa1/f1lAYviItlXJL+UX5MyaSEgfmT7du13SyVfXT5i iRYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=YbktVFy1ROaiWmtfYna6HNHTUj5/kbPnNNq3248Kr30=; b=i10XpFw2GzP8TUlJ9O70Tuj5kS1C8bByOSRe06Nuo+l81lU5McxVO3Mv8WrpWuiq1Z eQ26iIIj0rOr1D1bF8QPQnBIg4/2xjLgupAHMlP3GfYwfGbW+4CkVvDkYkIfFXxhEAdq EnIm/krYCfKNor1eWwMCt2dL8aCMaMMYkIbXuMO57eYe2VZy/zuG7XjVuewzxK+jVDHZ iGzq+t/Kb/JoPcD9gW+7Y+twalFKezSGS7gZPXfC1Sn15gvc52N/whJmpDDd2pwOd7o9 Lru9m77Q1D4hzpgmpdYvDsrYEubpZG0r4fTae3TlmntvSApPcy0qoQbZzTBCn0xaXjmN y8Ig== X-Gm-Message-State: AODbwcBVpBHFb11yGbP8N9W9zjPrS7RtxLH+Dpb9LnmCxrq6OPxanuLx BpfZFaByBuBheQuyr3A= X-Received: by 10.98.108.68 with SMTP id h65mr4937510pfc.98.1494409351298; Wed, 10 May 2017 02:42:31 -0700 (PDT) Received: from localhost.localdomain ([175.41.48.77]) by smtp.gmail.com with ESMTPSA id d6sm4125884pfk.90.2017.05.10.02.42.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 May 2017 02:42:30 -0700 (PDT) From: Po-Hsu Lin To: kernel-team@lists.ubuntu.com Subject: [Yakkety][PATCH] tracing: Use strlcpy() instead of strcpy() in __trace_find_cmdline() Date: Wed, 10 May 2017 17:42:04 +0800 Message-Id: <1494409325-12936-4-git-send-email-po-hsu.lin@canonical.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1494409325-12936-1-git-send-email-po-hsu.lin@canonical.com> References: <1494409325-12936-1-git-send-email-po-hsu.lin@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: "P.-H. Lin" From: Amey Telawane Strcpy is inherently not safe, and strlcpy() should be used instead. __trace_find_cmdline() uses strcpy() because the comms saved must have a terminating nul character, but it doesn't hurt to add the extra protection of using strlcpy() instead of strcpy(). Link: http://lkml.kernel.org/r/1493806274-13936-1-git-send-email-amit.pundir@linaro.org Signed-off-by: Amey Telawane [AmitP: Cherry-picked this commit from CodeAurora kernel/msm-3.10 https://source.codeaurora.org/quic/la/kernel/msm-3.10/commit/?id=2161ae9a70b12cf18ac8e5952a20161ffbccb477] Signed-off-by: Amit Pundir [ Updated change log and removed the "- 1" from len parameter ] Signed-off-by: Steven Rostedt (VMware) (backported from commit e09e28671cda63e6308b31798b997639120e2a21) CVE-2017-0605 Signed-off-by: P.-H. Lin --- kernel/trace/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 93b4604..813f245 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -1862,7 +1862,7 @@ static void __trace_find_cmdline(int pid, char comm[]) map = savedcmd->map_pid_to_cmdline[pid]; if (map != NO_CMDLINE_MAP) - strcpy(comm, get_saved_cmdlines(map)); + strlcpy(comm, get_saved_cmdlines(map), TASK_COMM_LEN); else strcpy(comm, "<...>"); }