From patchwork Wed May 17 07:37: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: 763357 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 3wSR4k1lXkz9s84; Wed, 17 May 2017 17:38:14 +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="egeHxPnt"; 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 1dAtX6-0005oq-W2; Wed, 17 May 2017 07:38:08 +0000 Received: from mail-pf0-f169.google.com ([209.85.192.169]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1dAtX0-0005o2-EC for kernel-team@lists.ubuntu.com; Wed, 17 May 2017 07:38:02 +0000 Received: by mail-pf0-f169.google.com with SMTP id n23so3194067pfb.2 for ; Wed, 17 May 2017 00:38:02 -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=aV12LnJmCtmbNYNQQB1MF2iRQ4nQ5tFBJqF4BrWx+8U=; b=egeHxPntopQTe5im33sPNJI2pVM5QufO5edudweRfJUSV04LLL1SKTWu1vQnYd2Y9t 8uyCUd0YOuBjgMWznF6CMS/eaADbF7vfE5a2cKs55QJlpNohQq8+QMwlmGnXCpXHeJEJ DbC7LC09n4ndY0Pj8g5n7Ilm3ONoZ2aCPDDjNYeE9CfCCJ/9mfydPQd9PGLz+YW+8M8L Eb/ehkJA+xlYB7yMuH1D8brhI137ZkcCWk2O/Tik6ssBEQKh30rRStOO3nSs5cLK2YYx Se6RuCzveEGawDjJMkiTQf36UsFf2Z+ScpwQDjyWycyd9NpEXCFu3B3DRwnY7eba0oOI 52iw== 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=aV12LnJmCtmbNYNQQB1MF2iRQ4nQ5tFBJqF4BrWx+8U=; b=hlfbj3BZBV9kicyckjXGBOjVSvtm/AXHaoBY/b9vZ5a81nmrEAxrobpj/cMPhcF1br 5jBbR5f53zyntacBK5btuit2v1DvMCUscFcLCXZGtcFIrx+A92Wj0Ns88rX6W+vnT+xc 6yF9e6TMSOWTZFAnznzrbEgOBa9oAw4b0bwOlc11Ijc/LgEAvvLjz21qtM9CVmVQ1Tuy C+0l443R6ZVf7AQx2xT0FkGVRV7BhrQnMXWsNpQcqYQ4hYxGOr+F3da2QkNuUzNQbTm7 a3Cy+VpRzi+tJfe4Ii+nw6uJaRbcD8DlsI2vlrpEpT2e1BeJEXKElf5Jr2rjVJHDGwRw znDg== X-Gm-Message-State: AODbwcDfk/s8qmrv0sZ69ArsvwqwPcu5X9Br6cHnIu6qDhR1lXECrN2G TBBJtKsbdqfcAWRoTMA= X-Received: by 10.98.59.2 with SMTP id i2mr2289374pfa.50.1495006680767; Wed, 17 May 2017 00:38:00 -0700 (PDT) Received: from localhost.localdomain ([175.41.48.77]) by smtp.gmail.com with ESMTPSA id r73sm2346151pfk.114.2017.05.17.00.37.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 May 2017 00:37:59 -0700 (PDT) From: Po-Hsu Lin To: kernel-team@lists.ubuntu.com Subject: [CVE-2017-0605][Vivid] tracing: Use strlcpy() instead of strcpy() in __trace_find_cmdline() Date: Wed, 17 May 2017 15:37:36 +0800 Message-Id: <1495006656-898-2-git-send-email-po-hsu.lin@canonical.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1495006656-898-1-git-send-email-po-hsu.lin@canonical.com> References: <1495006656-898-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: 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) (cherry picked 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 bd3e6b1..8ec7b7b 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -1557,7 +1557,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, "<...>"); }