From patchwork Wed May 10 09:53:36 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: 760525 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 3wNBQn6rNHz9s2G; Wed, 10 May 2017 19:54:09 +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="X96fvtRT"; 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 1d8OJq-0001iv-HS; Wed, 10 May 2017 09:54:06 +0000 Received: from mail-pg0-f48.google.com ([74.125.83.48]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1d8OJl-0001iV-IW for kernel-team@lists.ubuntu.com; Wed, 10 May 2017 09:54:01 +0000 Received: by mail-pg0-f48.google.com with SMTP id u28so14094048pgn.1 for ; Wed, 10 May 2017 02:54:01 -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; bh=x9GupyiqDmGfNRkE85V7l8NOaj/u/9yrHA3wQgU2tBU=; b=X96fvtRTRfQU8CL46UA+jUQR9sytoM82m1Md8cS6o/6GWa3v5b7OG5he9sQinzPuAN 0Bc+rRTS0K3mrEohJntyzyB5Vh5/+d69uzsjqpt5e1hj9eL12EGSrctrNOthocg66eB9 xE2IjIwR+0l/jbWtIYbtad3jXrpEkK9Jypb6AgACKR2yd+MedhtUe8PHVHslamJ0WoLL COfIFiqQFHTld6YbhSfOekjz74kDwZrXZLWQ9p4snFhPJKrXHBJbQKrm8y4Q6oEyRiD9 by2MxjJ1mWKGT0dRsrfVQ9fXcOtunuKZIldyg0c5JUuPg/vpo9RUWeXogTS399Uvx3zb VljA== 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; bh=x9GupyiqDmGfNRkE85V7l8NOaj/u/9yrHA3wQgU2tBU=; b=XK0DbOFCuTj//JFE63cqmysruMknzrS+n51XPGxsNj5TFYWi0b89pimoggsS/ymmoc iOe65OgxbAnwW/5ARdgwtFzQoA/UtVvDmVvyK7u1Qso2V9VhzoPgbg+VvPPxwfiUJp3j sqYvixTLqazv2+8bb3gYip1bXjwTNfVJ95bplivcNq2ksHnwKSCfCwPz+ElVNNw5uWH6 p30nlkRcya6PzdNzt1o/ThqiyY+skyluTfiqBTxDldnQewblfOBPLR+24foHl+FSh8Kj 3+dADE8GFYVXSOaF+0GsfMXwdG9Be9vM9f7HgLOeUmuv6PwJk/JdjPn/dvzWuqVZQPED RBlQ== X-Gm-Message-State: AODbwcAl4Xm1fOtxCW5e4bzOdeAvtS4+yvrd15MYtpxfSRoVqkRX6AL+ Ftig7+tZNijZHvTw1rc= X-Received: by 10.84.233.205 with SMTP id m13mr6915329pln.72.1494410040078; Wed, 10 May 2017 02:54:00 -0700 (PDT) Received: from localhost.localdomain ([175.41.48.77]) by smtp.gmail.com with ESMTPSA id l7sm5887865pgn.10.2017.05.10.02.53.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 May 2017 02:53:59 -0700 (PDT) From: Po-Hsu Lin To: kernel-team@lists.ubuntu.com Subject: [Artful][PATCHv2] tracing: Use strlcpy() instead of strcpy() in __trace_find_cmdline() Date: Wed, 10 May 2017 17:53:36 +0800 Message-Id: <1494410019-13457-1-git-send-email-po-hsu.lin@canonical.com> X-Mailer: git-send-email 1.7.9.5 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: 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: Po-Hsu 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 0ad75e9..fe17169 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, "<...>"); }