Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp256179ybl; Thu, 23 Jan 2020 23:06:56 -0800 (PST) X-Google-Smtp-Source: APXvYqzcwoBiQI4drpECcuRoDqsxY2nzix5VkeWVojJrtvkLLBehdnRgncUZi2+lAmVu4TeWmOcC X-Received: by 2002:a9d:68d1:: with SMTP id i17mr1601419oto.367.1579849616654; Thu, 23 Jan 2020 23:06:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579849616; cv=none; d=google.com; s=arc-20160816; b=BSZmtYRik4BUe/SmmlFBkqbOA2AN7itUr/TUWgdLfPWgwas0gK6afor5PjZrlLHnI0 ADhHc+6jVycRhQ/3sGsFPCHRsI6YrCSASEwviXvdKaciTTQiZJzFo6MAvfA7Hgscsm3T uXzr2NDr9S/gyybBz/xp4byimyadDI84KjFQdxecPFtwO7pXzwGS7mkxAbGAA4oiA33T X+5ZoyKXRZVBMtlXQFRTyy8KoPfthUqzsX9BuIBZz2jsB3JUTugLQXPhYwnobR+pJtIN uwDgRGwqvov2RgaRkP/njx+ekBPbv3A4Y6H6IxDnMQWUzUSW/tPDzB0q9u9wyLeYWNTV n9mQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:mime-version:user-agent:date:message-id:cc:to :subject:from; bh=zBogPUJJ3RKXWSoOmcq+vdODD8pF5Kdpd9Jyr5xB9Rs=; b=b/xZzYtJfJhil3mBxPVHPB1Yy065mpc2ngXkX+L0sDvM//Y5QG+gQHAF/PwwaSOCn/ iikA9daBpws871FMaQs68LRI3qQVk5Nd5JQEATt6v4fXN9PMscHehKEzNGdZ9Asz6NER cdNnO2sRo1InVPuNesoK3gLxBjp1E1+wzVEjuflZQUAabFrlqQIq+Bwr0rtxAV9CQ/H5 Uh5733N8axFnKO5IdY7pRCTMmd0VwYqnFhes4mhGFLJPcIP0RoHbtRh8CXid/F/ZS+kx MDKRbEmNxCRj3EZJbefRzH0BEyMA65wo5VoSdtZtkVKQq6A3d6nBpsgojxLYLg8A7xpF hP2w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 128si2093509oih.78.2020.01.23.23.06.44; Thu, 23 Jan 2020 23:06:56 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730835AbgAXHDv (ORCPT + 99 others); Fri, 24 Jan 2020 02:03:51 -0500 Received: from relay.sw.ru ([185.231.240.75]:53208 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730779AbgAXHDu (ORCPT ); Fri, 24 Jan 2020 02:03:50 -0500 Received: from vvs-ws.sw.ru ([172.16.24.21]) by relay.sw.ru with esmtp (Exim 4.92.3) (envelope-from ) id 1iuszj-00086M-3X; Fri, 24 Jan 2020 10:03:07 +0300 From: Vasily Averin Subject: [PATCH 6/7] trigger_next should increase position index To: linux-kernel@vger.kernel.org Cc: Andrew Morton , NeilBrown , Waiman Long , Steven Rostedt , Ingo Molnar , Peter Oberparleiter Message-ID: <3c35ee24-dd3a-8119-9c19-552ed253388a@virtuozzo.com> Date: Fri, 24 Jan 2020 10:03:06 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org if seq_file .next fuction does not change position index, read after some lseek can generate unexpected output. https://bugzilla.kernel.org/show_bug.cgi?id=206283 Signed-off-by: Vasily Averin --- kernel/trace/trace_events_trigger.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kernel/trace/trace_events_trigger.c b/kernel/trace/trace_events_trigger.c index 2cd53ca..d5f5e5c 100644 --- a/kernel/trace/trace_events_trigger.c +++ b/kernel/trace/trace_events_trigger.c @@ -116,9 +116,10 @@ static void *trigger_next(struct seq_file *m, void *t, loff_t *pos) { struct trace_event_file *event_file = event_file_data(m->private); - if (t == SHOW_AVAILABLE_TRIGGERS) + if (t == SHOW_AVAILABLE_TRIGGERS) { + (*pos)++; return NULL; - + } return seq_list_next(t, &event_file->triggers, pos); } -- 1.8.3.1