From patchwork Thu Jun 1 16:13:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 100946 Delivered-To: patch@linaro.org Received: by 10.182.202.35 with SMTP id kf3csp833697obc; Thu, 1 Jun 2017 09:13:40 -0700 (PDT) X-Received: by 10.101.76.11 with SMTP id u11mr1806271pgq.109.1496333620173; Thu, 01 Jun 2017 09:13:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496333620; cv=none; d=google.com; s=arc-20160816; b=wNrfNk6AOlAw70I7OCfxZa9TEr3+MWnidz3m3eeCtnX/MrB0LhLb1u0QsOp9ke7/XE Y4C6sW6Od+zazx53GpKa47h15GKY0qYBEGqBuwPtIaHKluWLUngG2hd+teNyBS50x/ez ZZd7kJaGU6Y/y4x+KvBlsHQFxlEd0Zew6BN2YaZPl8bdtdu6NOHMU0YlhPSrVm3bycPG 8nd6Mdeq07cfu/wZWpdCKFVaKzayEKg+jAxeoXycQVNd9tr9jVtdRgiOwxwBU1rEItBF YwCJS+1bngWTBWh3mh9XtVkD2VDSHHWR3sg/53Gc3midBhdnSU0jlaX+r7Jdif+UOGou MzxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=l4MHSwN/dYqMaHxvx+uCdxgXC5c+bechp/1lTTWEoz4=; b=plWsloQAMchBV/FFE8OCvsGSvrzfDRh47nKbzP6tj6QOgi+KoSOEDMy77WuOf1Xu1Z LYlutG1urhyoAQ870FKTVDTYntU4tT2CP8sbvUENGD6B37Rcpzz0nItktKAE2X+Xa77z Vk/mX0kKoJ3pjdosRkzYi/M15GWLKOxsu2br88p1gmiis3FiEdsFC19KBGwhsrx9zw/4 378LR/p6DcHX7X07Knz636DI+e+wnQVWrq/t/pVeFztlkihnVPpQrLAffoModkLDfcy+ mz7+EmN7LR4Wm42h7ImCasZlwlOqoNKJoPs9LYvFwxprc9jqngSHZraj2WATTo+ANBKL KmhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m10si19229225pgs.81.2017.06.01.09.13.39; Thu, 01 Jun 2017 09:13:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751364AbdFAQNd (ORCPT + 6 others); Thu, 1 Jun 2017 12:13:33 -0400 Received: from mail-pf0-f178.google.com ([209.85.192.178]:33280 "EHLO mail-pf0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751134AbdFAQNb (ORCPT ); Thu, 1 Jun 2017 12:13:31 -0400 Received: by mail-pf0-f178.google.com with SMTP id e193so31338110pfh.0 for ; Thu, 01 Jun 2017 09:13:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=l4MHSwN/dYqMaHxvx+uCdxgXC5c+bechp/1lTTWEoz4=; b=BHFAQMTQYc2ZlGezo48CYj72ZOwqwytMBz28/8W5LbxLTLL2UaPZ9jhzjDKXpiAYwk e7kQWPj3CzrocTkzMBL0WEFMyEkp7td9z3a8yswgCcw+yXmUdHQ54ynBIy5Htxo1qJ5P eo9zPGlMR+9sE5jmePnJ8TCmQvLNGoEk0RM9M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=l4MHSwN/dYqMaHxvx+uCdxgXC5c+bechp/1lTTWEoz4=; b=FAkvT+oGGAs1Xp9Fb9YxxZXdZZEcVy6329cH30vkS0JcOnA6XkLp7rCW7NJGVwBncd PLuPKipuyaNO4CdiaXt60va22ZnFzV3gxLdvkrmm9DIXCe+5d93cXoRC2ls1ArXtfgnU Siuqp2aIAfaXNoRzSpIMaZIK/MDnmmxy1nPvtLVa+dfkmlwNJyemqBCkgcZhVezN/hiA OyLkw/ZDC2ULeLmJy9PHmt9MOQ61Qf0SAYZK3cTlDsUtAg5B4pp61/fVFAYgbbURXQdz ivX6OlcM0oup6/iq9wlT2+EW9ymEbBcEVpX75FLkp8r3oGxVon7oX0lyXDESzbmVKMJJ toqw== X-Gm-Message-State: AODbwcDZY6Cnr4VmswanZQavJtsuOcQj+XDG5xgbRXjvyA0sFLWCi60E 7ifvcKyGJsxJfPcW X-Received: by 10.84.132.2 with SMTP id 2mr98103545ple.46.1496333600842; Thu, 01 Jun 2017 09:13:20 -0700 (PDT) Received: from localhost.localdomain ([106.51.140.154]) by smtp.gmail.com with ESMTPSA id u67sm30182077pgb.24.2017.06.01.09.13.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 01 Jun 2017 09:13:19 -0700 (PDT) From: Amit Pundir To: Greg KH Cc: Stable , Amey Telawane , Steven Rostedt Subject: [PATCH for-4.9] tracing: Use strlcpy() instead of strcpy() in __trace_find_cmdline() Date: Thu, 1 Jun 2017 21:43:13 +0530 Message-Id: <1496333593-31538-1-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Amey Telawane commit e09e28671cda63e6308b31798b997639120e2a21 upstream. 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) --- kernel/trace/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4 diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 0ad75e9698f6..fe171695492c 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -1899,7 +1899,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, "<...>"); }