From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-402196-1526281038-3-15478475410503578606 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.249, RCVD_IN_DNSWL_HI -5, SPF_PASS -0.001, LANGUAGES enda, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='198.145.29.99', Host='mail.kernel.org', Country='US', FromHeader='org', MailFrom='org' X-Spam-charsets: cc='UTF-8', plain='UTF-8' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: SRS0=ywzk=IB=linuxfoundation.org=gregkh@kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=fm2; t= 1526281037; b=a2cJ3P2jhbpKI2jNvJkA1iOFyzzo/w2ANVyIj4Z+yLIIJzb6QU 0+i/0QhrG/GDVwvygY8D29pcvWty29d1do+MFql4s0y5kFwRartVxZ23q0UINJfW IgYO7vZdrEnbfoxj2j+KU7wdLs3sf4ilDvito3OHVibAkKjS7x0/XV2q7X2sWgAJ 1Ks/CIgo2lcPMT4BUvwEJfZG2dU0ehXbu0BUkYktaGUF3UrigCMpSZ9lmWmxLQoF 4AI5VKoW5ysTf4wan9ZuHuE3atVzKkIgOxnJzf6wKoad/Dhdr34M1zDJktfK8TRP Qp8C9GT6iJEVEgjzJfAUK3Zvi5C9U7DqiFyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type; s=fm2; t= 1526281037; bh=mIFVSJb2lUA6h1QEhIvvY72lg7TZy6hlxiAthGaC5aQ=; b=h TzPm63iq+g4GrJToqTzkBZKmrSyrqBNjXJ/ql/wcnLXFR6jDdN9tfb6UbLXnYZHb t+t1dJLGybHlwHPgO8vJ7hy4PWboPNMjLg2ZhfUMSNPihBzemCFb0qJIyL3lsmC4 hsB6PpDIcZ7c0kvMcakyf433Cb8SPFgQtsiwkBQocZYuAYgbY3ty6TeT1nd5am+7 TySVugx8IgKQomZWNNNtHcFKnwc4PhiW045I0W3zQI8c2k9ZSXdA9AgBukCNnVlB Mg0BIXW/mHLdq1cd3UT1YZCam4NRg2z+YeoKUI2p1cKuXYwgl+39s155mxuk4HRL HoycEswJeSJ6sC9x/5Xvw== ARC-Authentication-Results: i=1; mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=kernel.org header.i=@kernel.org header.b=J563QtLU x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=default; dmarc=none (p=none,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=198.145.29.99 (mail.kernel.org); spf=pass smtp.mailfrom="SRS0=ywzk=IB=linuxfoundation.org=gregkh@kernel.org" smtp.helo=mail.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=mail.kernel.org x-ptr-lookup=mail.kernel.org; x-return-mx=pass smtp.domain=kernel.org smtp.result=pass smtp_is_org_domain=yes header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-tls=pass version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128; x-vs=clean score=-100 state=0 Authentication-Results: mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=kernel.org header.i=@kernel.org header.b=J563QtLU x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=default; dmarc=none (p=none,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=198.145.29.99 (mail.kernel.org); spf=pass smtp.mailfrom="SRS0=ywzk=IB=linuxfoundation.org=gregkh@kernel.org" smtp.helo=mail.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=mail.kernel.org x-ptr-lookup=mail.kernel.org; x-return-mx=pass smtp.domain=kernel.org smtp.result=pass smtp_is_org_domain=yes header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-tls=pass version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfF1Og+4FACrP2e92kzigUdUqYn3MFNzFgyzUPPujBE+GkGxfuELt4DlmWjt4d4zCoQS0kUT+7NoOi5xXKroRRCM8WNS+0dpGTVwv3hvAMQUCIRKcLX2y n3WxgtMmY6l/8wjeyzqElcPXoa2/UqaCFJ/pTgOq+Nnumh+ghILL596idBZwwVkRKcj1nSWLsB/I3LJuRZ03ERAYVItMzNmVUbr+d5XZnqKIZvCdtiNoAEQc X-CM-Analysis: v=2.3 cv=NPP7BXyg c=1 sm=1 tr=0 a=czNdAM+YcK12vDHDihaDnQ==:117 a=czNdAM+YcK12vDHDihaDnQ==:17 a=IkcTkHD0fZMA:10 a=VUJBJC2UJ8kA:10 a=VwQbUJbxAAAA:8 a=Z4Rwk6OoAAAA:8 a=JfrnYn6hAAAA:8 a=FOH2dFAWAAAA:8 a=gnbuhwpKAAAA:8 a=ag1SF4gXAAAA:8 a=jgO6SH3aC7yEc3PU-okA:9 a=QEXdDO2ut3YA:10 a=AjGcO6oz07-iQ99wixmX:22 a=HkZW87K1Qel5hWWM3VKY:22 a=1CNFftbPRP8L7MoqJWF3:22 a=i3VuKzQdj-NEYjvDI-p3:22 a=Yupwre4RP9_Eg_Bd0iYG:22 X-ME-CMScore: 0 X-ME-CMCategory: none X-Remote-Delivered-To: security@kernel.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Masami Hiramatsu , Linus Torvalds , Peter Zijlstra , Song Liu , Thomas Gleixner , security@kernel.org, =?UTF-8?q?=E8=8C=83=E9=BE=99=E9=A3=9E?= , Ingo Molnar Subject: [PATCH 4.14 55/62] tracing/uprobe_event: Fix strncpy corner case Date: Mon, 14 May 2018 08:49:11 +0200 Message-Id: <20180514064819.539389393@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180514064816.436958006@linuxfoundation.org> References: <20180514064816.436958006@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Masami Hiramatsu commit 50268a3d266ecfdd6c5873d62b2758d9732fc598 upstream. Fix string fetch function to terminate with NUL. It is OK to drop the rest of string. Signed-off-by: Masami Hiramatsu Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Song Liu Cc: Thomas Gleixner Cc: security@kernel.org Cc: 范龙飞 Fixes: 5baaa59ef09e ("tracing/probes: Implement 'memory' fetch method for uprobes") Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman --- kernel/trace/trace_uprobe.c | 2 ++ 1 file changed, 2 insertions(+) --- a/kernel/trace/trace_uprobe.c +++ b/kernel/trace/trace_uprobe.c @@ -152,6 +152,8 @@ static void FETCH_FUNC_NAME(memory, stri return; ret = strncpy_from_user(dst, src, maxlen); + if (ret == maxlen) + dst[--ret] = '\0'; if (ret < 0) { /* Failed to fetch string */ ((u8 *)get_rloc_data(dest))[0] = '\0';