Skip to contentSkip to conversation

prot_hsymlinks.c: remove the unnecessary calling of cleanup

PATCH Applied DAN LI 2 participants 3 messages May 16, 2013 – May 21, 2013

lore
Share & tools
lore

DAN LI

author
#0 lore raw

PATCH 1/1 prot_hsymlinks.c: remove the unnecessary calling of cleanup

Should not call cleanup here since nothing was setted by setup.

---
 testcases/kernel/security/prot_hsymlinks/prot_hsymlinks.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
(quoted diff) +0 -0

b/testcases/kernel/security/prot_hsymlinks/prot_hsymlinks.c index 1eec0f9..82bc770 100644

testcases/kernel/security/prot_hsymlinks/prot_hsymlinks.c +2 -3
@@ -196,10 +196,9 @@ static void setup(int argc, char *argv[])
 
 	tst_require_root(NULL);
 
-	if (tst_kvercmp(3, 7, 0) < 0) {
-		tst_brkm(TCONF, cleanup,
+	if (tst_kvercmp(3, 7, 0) < 0)
+		tst_brkm(TCONF, NULL,
 			"Test must be run with kernel 3.7 or newer");
-	}
 
 	/* initialize user names */
 	strcpy(users[ROOT].name, "root");
Signature · 13 lines
1.7.11.rc0


------------------------------------------------------------------------------
AlienVault Unified Security Management (USM) platform delivers complete
security visibility with the essential security capabilities. Easily and
efficiently configure, manage, and operate all of your security controls
from a single console and one unified framework. Download a free trial.
http://p.sf.net/sfu/alienvault_d2d
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list
author
#1 lore raw

Hi,
sirs

any comment for this patch?

This unnecessary calling of cleanup() will cause TC prot_hsymlinks failing when kernel is older than 3.7.0.

Quoted 17 lines · DAN LI

Should not call cleanup here since nothing was setted by setup.

---
 testcases/kernel/security/prot_hsymlinks/prot_hsymlinks.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
testcases/kernel/security/prot_hsymlinks/prot_hsymlinks.c +0 -0
index 1eec0f9..82bc770 100644
@@ -196,10 +196,9 @@ static void setup(int argc, char *argv[])
 
 	tst_require_root(NULL);

testcases/kernel/security/prot_hsymlinks/prot_hsymlinks.c static void setup(int argc, char *argv[]) · line 204

Quoted 10 lines
testcases/kernel/security/prot_hsymlinks/prot_hsymlinks.c +2 -3
 
-	if (tst_kvercmp(3, 7, 0) < 0) {
-		tst_brkm(TCONF, cleanup,
+	if (tst_kvercmp(3, 7, 0) < 0)
+		tst_brkm(TCONF, NULL,
 			"Test must be run with kernel 3.7 or newer");
-	}
 
 	/* initialize user names */
 	strcpy(users[ROOT].name, "root");

------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service that delivers powerful full stack analytics. Optimize and monitor your browser, app, & servers with just a few lines of code. Try New Relic and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list

Applied
#2 lore raw
In reply to DAN LI
Quoted 3 lines · DAN LI

Should not call cleanup here since nothing was setted by setup.

Applied, thank you.

Wanlong Gao

------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service that delivers powerful full stack analytics. Optimize and monitor your browser, app, & servers with just a few lines of code. Try New Relic and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list