Received: by 2002:ac0:950c:0:0:0:0:0 with SMTP id f12csp461591imc; Sun, 10 Mar 2019 10:50:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqzzW7PHgAKHbyzG+dHfbL5bWA0dg76RXsGuDLZz3NdpdNyDuH0ZoB9NRKS2OFVVRVnT2y5A X-Received: by 2002:a17:902:284b:: with SMTP id e69mr28956162plb.11.1552240235064; Sun, 10 Mar 2019 10:50:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552240235; cv=none; d=google.com; s=arc-20160816; b=uGafBwGyGz7mNZZTSb0YXk2HWTup8Qz4GG3HpeI3tfCj9XtBpyD0KBXUzVFkhEIFpg rZf6P7oh7kBnep304CW/q4CM/aFZK6YR6xvs+Rc1dRrYfkk5X5N6H0LReoumOMBmHrUr wAWMTyPxM/cyiwV8SOp4Ada43xZDp/ZUwnxb9SQEXD6QiyDktprAqbZkcnSvsVJeVmMc IV3d/eLGblUo9rTJ0Y/zAYjxVBb2/HTua9H9xvDBGjR32ptqKY5228tB8KW31j3M+rtZ Pfm/m1Mf3G2o3yCUfx2FKzc4tPLiba7UGLcKlfJaFvXVV18BJb1FvDzxlr7hQsWB+0O6 K9nA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:content-transfer-encoding :mime-version:references:in-reply-to:date:cc:to:from:subject; bh=PvRINFHfPRiFA2Ws9TFrEaY0SixBeotX/XwqYWFHncA=; b=S8k3AE0fQbhsJxSVwQfAq5Fvu+Y9ZTjRv6G4lTpu/18P8kyfiU1P1vY3punUf7iIUr PWxEDrtpebjz3J+ONPPxAF0wEbxgnWdevR5H05lsIlx25hDVqLdMOxmzA9lnjTMNG+kv zovP1FeTKcGDOMMYa55ql8u4tRHWPU7ZF63xGfnWCQIXwHlgvgFEUF48bshA7JzxQSGW Ic5PuccK8bx2iaxIVvoPQexyqeftA9x4XaRsRKgoVCZ1b3ZXMdzTee835C/Yd9zLt3X8 1kllos25rDmCg6EtIAwsb+F+0H2TbGMfVsBTNC4jJ/lrhuzBg0Yjonet3Zam0gSSF0fz X2ew== 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=ibm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w2si3205512pgm.456.2019.03.10.10.50.19; Sun, 10 Mar 2019 10:50:35 -0700 (PDT) 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=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726727AbfCJRsn (ORCPT + 99 others); Sun, 10 Mar 2019 13:48:43 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:43510 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726661AbfCJRsm (ORCPT ); Sun, 10 Mar 2019 13:48:42 -0400 Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x2AHhfQZ102964 for ; Sun, 10 Mar 2019 13:48:41 -0400 Received: from e06smtp01.uk.ibm.com (e06smtp01.uk.ibm.com [195.75.94.97]) by mx0a-001b2d01.pphosted.com with ESMTP id 2r4ufa9hfu-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sun, 10 Mar 2019 13:48:41 -0400 Received: from localhost by e06smtp01.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sun, 10 Mar 2019 17:48:39 -0000 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) by e06smtp01.uk.ibm.com (192.168.101.131) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Sun, 10 Mar 2019 17:48:36 -0000 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x2AHmZqa34275542 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 10 Mar 2019 17:48:35 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 794A34C04A; Sun, 10 Mar 2019 17:48:35 +0000 (GMT) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AC2424C040; Sun, 10 Mar 2019 17:48:34 +0000 (GMT) Received: from localhost.localdomain (unknown [9.80.93.199]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTP; Sun, 10 Mar 2019 17:48:34 +0000 (GMT) Subject: Re: [PATCH v2 4/5] selftests/ima: kexec_file_load syscall test From: Mimi Zohar To: Petr Vorel Cc: linux-kselftest@vger.kernel.org, Shuah Khan , linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org Date: Sun, 10 Mar 2019 13:48:24 -0400 In-Reply-To: <20190228220039.GC20335@dell5510> References: <1551223620-11586-1-git-send-email-zohar@linux.ibm.com> <1551223620-11586-5-git-send-email-zohar@linux.ibm.com> <20190228220039.GC20335@dell5510> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.20.5 (3.20.5-1.fc24) Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 x-cbid: 19031017-4275-0000-0000-000003195870 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19031017-4276-0000-0000-00003827BA5C Message-Id: <1552240104.5062.10.camel@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-03-10_16:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=589 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1903100138 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 2019-02-28 at 23:00 +0100, Petr Vorel wrote: > > + local keypair1="$2" > > + local keypair2="$3" > > + > > + mount_securityfs > > + > > + local ima_policy=$SECURITYFS/ima/policy > > + if [ ! -e $ima_policy ]; then > > + log_fail "$ima_policy not found" > > + fi > > + > > + if [ -n $keypair2 ]; then > > + grep -e "^$action.*$keypair1" "$ima_policy" | \ > > + grep -q -e "$keypair2" > > + else > > + grep -q -e "^$action.*$keypair1" "$ima_policy" > > + fi > > + > > + [ $? -eq 0 ] && ret=1 || ret=0 > > + return $ret > return $? is enough here (+ ret was not defined as local and mixing tabs with spaces) "grep -q" exits with zero if any match is found.  This line inverts the result so that 1 is returned for found.  v3 will make "ret" local and fix the tabs/spaces. Mimi