Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754171AbcDZXOc (ORCPT ); Tue, 26 Apr 2016 19:14:32 -0400 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:40246 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754100AbcDZXOI (ORCPT ); Tue, 26 Apr 2016 19:14:08 -0400 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org, "Dmitry V. Levin" , "Al Viro" Date: Wed, 27 Apr 2016 01:02:21 +0200 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) Subject: [PATCH 3.16 114/217] vfs: show_vfsstat: do not ignore errors from show_devname method In-Reply-To: X-SA-Exim-Connect-IP: 2a02:8426:ae4:c500:9cba:69ae:962d:6167 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 970 Lines: 35 3.16.35-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: "Dmitry V. Levin" commit 5f8d498d4364f544fee17125787a47553db02afa upstream. Explicitly check show_devname method return code and bail out in case of an error. This fixes regression introduced by commit 9d4d65748a5c. Signed-off-by: Dmitry V. Levin Signed-off-by: Al Viro [bwh: Backported to 3.16: add the 'out' label] Signed-off-by: Ben Hutchings --- --- a/fs/proc_namespace.c +++ b/fs/proc_namespace.c @@ -191,6 +191,8 @@ static int show_vfsstat(struct seq_file if (sb->s_op->show_devname) { seq_puts(m, "device "); err = sb->s_op->show_devname(m, mnt_path.dentry); + if (err) + goto out; } else { if (r->mnt_devname) { seq_puts(m, "device "); @@ -216,6 +218,7 @@ static int show_vfsstat(struct seq_file } seq_putc(m, '\n'); +out: return err; }