From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 18E4AC48BD6 for ; Thu, 27 Jun 2019 00:39:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DB4E421871 for ; Thu, 27 Jun 2019 00:39:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561595979; bh=yO4X+tkatb6ouNmpPwbj6DIRyc/jJnTsov6Jg1xCx9Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MTZ8Ru8HribkuA1aAuc5dNCxaPGsYIlMv86IGrWX1OCyMivpSDJQnngnSIqiEkmvx QqNm/VOp9vsvj5hlNYFcQppnTzWcaf5XTmpFz+J+JlJWsbGv+1kcFwd3dlHdv36BSJ db+X/udQuexjnv900M5izjOlcxQQLh0+CiQapYhM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729128AbfF0Ajf (ORCPT ); Wed, 26 Jun 2019 20:39:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:43710 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728015AbfF0Aje (ORCPT ); Wed, 26 Jun 2019 20:39:34 -0400 Received: from sasha-vm.mshome.net (unknown [107.242.116.147]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 330BB2187F; Thu, 27 Jun 2019 00:39:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561595973; bh=yO4X+tkatb6ouNmpPwbj6DIRyc/jJnTsov6Jg1xCx9Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B80IADQnH3DRfn+RXhhp23krsNTjCPPFYu25zSH483pHU8Y221bNqDTVC+E0HXFEk p/fzPWCb5+l1DlpMBzt8d6N1Ukva4rYaDgIvLTAXvcpWsrk8MylQEQTG9McPKCszKT 5QVsz/Us+h/o9aKLvo/nEqkxrnRcy4j+jnwaW2Kw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Chang-Hsien Tsai , Daniel Borkmann , Sasha Levin , netdev@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 02/35] samples, bpf: fix to change the buffer size for read() Date: Wed, 26 Jun 2019 20:38:50 -0400 Message-Id: <20190627003925.21330-2-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190627003925.21330-1-sashal@kernel.org> References: <20190627003925.21330-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Chang-Hsien Tsai [ Upstream commit f7c2d64bac1be2ff32f8e4f500c6e5429c1003e0 ] If the trace for read is larger than 4096, the return value sz will be 4096. This results in off-by-one error on buf: static char buf[4096]; ssize_t sz; sz = read(trace_fd, buf, sizeof(buf)); if (sz > 0) { buf[sz] = 0; puts(buf); } Signed-off-by: Chang-Hsien Tsai Signed-off-by: Daniel Borkmann Signed-off-by: Sasha Levin --- samples/bpf/bpf_load.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/bpf/bpf_load.c b/samples/bpf/bpf_load.c index 2325d7ad76df..e8e8b756dc52 100644 --- a/samples/bpf/bpf_load.c +++ b/samples/bpf/bpf_load.c @@ -613,7 +613,7 @@ void read_trace_pipe(void) static char buf[4096]; ssize_t sz; - sz = read(trace_fd, buf, sizeof(buf)); + sz = read(trace_fd, buf, sizeof(buf) - 1); if (sz > 0) { buf[sz] = 0; puts(buf); -- 2.20.1