[5.9,43/46] tracing: Fix alignment of static buffer

Message ID	20201206111558.535748209@linuxfoundation.org
State	New
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Namhyung Kim <namhyung@kernel.org>, Minchan Kim <minchan@kernel.org>, "Steven Rostedt (VMware)" <rostedt@goodmis.org> Subject: [PATCH 5.9 43/46] tracing: Fix alignment of static buffer Date: Sun, 6 Dec 2020 12:17:51 +0100 Message-Id: <20201206111558.535748209@linuxfoundation.org> In-Reply-To: <20201206111556.455533723@linuxfoundation.org> References: <20201206111556.455533723@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.9,02/46] devlink: Make sure devlink instance and port are in same net namespace [5.9,03/46] ipv6: addrlabel: fix possible memory leak in ip6addrlbl_net_init [5.9,04/46] net/af_iucv: set correct sk_protocol for child sockets [5.9,05/46] net: openvswitch: fix TTL decrement action netlink message format [5.9,06/46] net/tls: missing received data after fast remote close [5.9,07/46] net/tls: Protect from calling tls_dev_del for TLS RX twice [5.9,08/46] rose: Fix Null pointer dereference in rose_send_frame() [5.9,09/46] sock: set sk_err to ee_errno on dequeue from errq [5.9,10/46] tcp: Set INET_ECN_xmit configuration in tcp_reinit_congestion_control [5.9,11/46] tun: honor IOCB_NOWAIT flag [5.9,12/46] usbnet: ipheth: fix connectivity with iOS 14 [5.9,13/46] vsock/virtio: discard packets only when socket is really closed [5.9,14/46] mptcp: fix NULL ptr dereference on bad MPJ [5.9,15/46] net/packet: fix packet receive on L3 devices without visible hard header [5.9,16/46] netfilter: bridge: reset skb->pkt_type after NF_INET_POST_ROUTING traversal [5.9,17/46] ipv4: Fix tos mask in inet_rtm_getroute() [5.9,18/46] dt-bindings: net: correct interrupt flags in examples [5.9,19/46] chelsio/chtls: fix panic during unload reload chtls [5.9,20/46] ibmvnic: Ensure that SCRQ entry reads are correctly ordered [5.9,21/46] ibmvnic: Fix TX completion error handling [5.9,22/46] tipc: fix incompatible mtu of transmission [5.9,24/46] geneve: pull IP header before ECN decapsulation [5.9,25/46] net: ip6_gre: set dev->hard_header_len when using header_ops [5.9,26/46] dpaa_eth: copy timestamp fields to new skb in A-050385 workaround [5.9,27/46] net/x25: prevent a couple of overflows [5.9,28/46] cxgb3: fix error return code in t3_sge_alloc_qset() [5.9,29/46] net: pasemi: fix error return code in pasemi_mac_open() [5.9,30/46] vxlan: fix error return code in __vxlan_dev_create() [5.9,31/46] chelsio/chtls: fix a double free in chtls_setkey() [5.9,32/46] net: mvpp2: Fix error return code in mvpp2_open() [5.9,33/46] net: skbuff: ensure LSE is pullable before decrementing the MPLS ttl [5.9,34/46] net: openvswitch: ensure LSE is pullable before reading it [5.9,35/46] net/sched: act_mpls: ensure LSE is pullable before reading it [5.9,36/46] net/mlx5: DR, Proper handling of unsupported Connect-X6DX SW steering [5.9,37/46] net/mlx5: Fix wrong address reclaim when command interface is down [5.9,38/46] net: mlx5e: fix fs_tcp.c build when IPV6 is not enabled [5.9,39/46] ALSA: usb-audio: US16x08: fix value count for level meters [5.9,40/46] Input: xpad - support Ardwiino Controllers [5.9,41/46] Input: i8042 - add ByteSpeed touchpad to noloop table [5.9,42/46] Input: atmel_mxt_ts - fix lost interrupts [5.9,43/46] tracing: Fix alignment of static buffer [5.9,44/46] tracing: Remove WARN_ON in start_thread() [5.9,45/46] uapi: fix statx attribute value overlap for DAX & MOUNT_ROOT [5.9,46/46] drm/i915/gt: Fixup tgl mocs for PTE tracking

Message ID

20201206111558.535748209@linuxfoundation.org

State

New

Headers

From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, Namhyung Kim <namhyung@kernel.org>,
	Minchan Kim <minchan@kernel.org>,
	"Steven Rostedt (VMware)" <rostedt@goodmis.org>
Subject: [PATCH 5.9 43/46] tracing: Fix alignment of static buffer
Date: Sun,  6 Dec 2020 12:17:51 +0100
Message-Id: <20201206111558.535748209@linuxfoundation.org>
In-Reply-To: <20201206111556.455533723@linuxfoundation.org>
References: <20201206111556.455533723@linuxfoundation.org>
User-Agent: quilt/0.66
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

None | expand

Commit Message

Greg KH Dec. 6, 2020, 11:17 a.m. UTC

From: Minchan Kim <minchan@kernel.org>

commit 8fa655a3a0013a0c2a2aada6f39a93ee6fc25549 upstream.

With 5.9 kernel on ARM64, I found ftrace_dump output was broken but
it had no problem with normal output "cat /sys/kernel/debug/tracing/trace".

With investigation, it seems coping the data into temporal buffer seems to
break the align binary printf expects if the static buffer is not aligned
with 4-byte. IIUC, get_arg in bstr_printf expects that args has already
right align to be decoded and seq_buf_bprintf says ``the arguments are saved
in a 32bit word array that is defined by the format string constraints``.
So if we don't keep the align under copy to temporal buffer, the output
will be broken by shifting some bytes.

This patch fixes it.

Link: https://lkml.kernel.org/r/20201125225654.1618966-1-minchan@kernel.org

Cc: <stable@vger.kernel.org>
Fixes: 8e99cf91b99bb ("tracing: Do not allocate buffer in trace_find_next_entry() in atomic")
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Minchan Kim <minchan@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 kernel/trace/trace.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -3516,7 +3516,7 @@  __find_next_entry(struct trace_iterator
 }
 
 #define STATIC_TEMP_BUF_SIZE	128
-static char static_temp_buf[STATIC_TEMP_BUF_SIZE];
+static char static_temp_buf[STATIC_TEMP_BUF_SIZE] __aligned(4);
 
 /* Find the next real entry, without updating the iterator itself */
 struct trace_entry *trace_find_next_entry(struct trace_iterator *iter,

[5.9,43/46] tracing: Fix alignment of static buffer

Commit Message

Patch