From: Eugene Syromyatnikov <evgsyr@gmail.com>
Date: Sun, 19 Aug 2018 17:58:18 +0000 (+0200)
Subject: nsfs: simplify auxstr logic
X-Git-Tag: v4.25~57
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=25a4cafa90d77e92092474dba024baafe9aed091;p=strace

nsfs: simplify auxstr logic

There's no need to check whether non-NULL value is being assigned to
auxstr; syscall_exiting_trace does it itself.

* nsfs.c (nsfs_ioctl) <case NS_GET_NSTYPE>: Simply assign result of
xlookup to auxstr if syserror(tcp) is false.
---

diff --git a/nsfs.c b/nsfs.c
index 493dcd57..bd765008 100644
--- a/nsfs.c
+++ b/nsfs.c
@@ -41,15 +41,9 @@ nsfs_ioctl(struct tcb *tcp, unsigned int code, kernel_ulong_t arg)
 	case NS_GET_NSTYPE:
 		if (entering(tcp))
 			return 0;
-		if (!syserror(tcp)) {
-			const char *outstr;
-			outstr = xlookup(setns_types, tcp->u_rval);
-			if (outstr) {
-				tcp->auxstr = outstr;
-				return RVAL_IOCTL_DECODED | RVAL_STR;
-			}
-		}
-		return RVAL_IOCTL_DECODED;
+		if (!syserror(tcp))
+			tcp->auxstr = xlookup(setns_types, tcp->u_rval);
+		return RVAL_IOCTL_DECODED | RVAL_STR;
 	case NS_GET_OWNER_UID:
 		if (entering(tcp))
 			return 0;