From: Jan Engelhardt <jengelh@medozas.de>
Date: Fri, 26 Mar 2010 22:17:23 +0000 (+0100)
Subject: xt_SYSRQ: do not print error messages on ENOMEM
X-Git-Tag: v1.25~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd8fdd09c818442f538fa30dc1b87c4f5467141d;p=thirdparty%2Fxtables-addons.git

xt_SYSRQ: do not print error messages on ENOMEM

Memory allocation failures are usually already reported by SLAB and
the ENOMEM error code itself.
---

diff --git a/extensions/xt_SYSRQ.c b/extensions/xt_SYSRQ.c
index ffcb6ee..1208ae6 100644
--- a/extensions/xt_SYSRQ.c
+++ b/extensions/xt_SYSRQ.c
@@ -332,23 +332,14 @@ static int __init sysrq_crypto_init(void)
 	sysrq_digest_size = crypto_hash_digestsize(sysrq_tfm);
 	sysrq_digest = kmalloc(sysrq_digest_size, GFP_KERNEL);
 	ret = -ENOMEM;
-	if (sysrq_digest == NULL) {
-		printk(KERN_WARNING KBUILD_MODNAME
-			": Cannot allocate digest\n");
+	if (sysrq_digest == NULL)
 		goto fail;
-	}
 	sysrq_hexdigest = kmalloc(2 * sysrq_digest_size + 1, GFP_KERNEL);
-	if (sysrq_hexdigest == NULL) {
-		printk(KERN_WARNING KBUILD_MODNAME
-			": Cannot allocate hexdigest\n");
+	if (sysrq_hexdigest == NULL)
 		goto fail;
-	}
 	sysrq_digest_password = kmalloc(sizeof(sysrq_password), GFP_KERNEL);
-	if (sysrq_digest_password == NULL) {
-		printk(KERN_WARNING KBUILD_MODNAME
-			": Cannot allocate password digest space\n");
+	if (sysrq_digest_password == NULL)
 		goto fail;
-	}
 	do_gettimeofday(&now);
 	sysrq_seqno = now.tv_sec;
 	ret = xt_register_targets(sysrq_tg_reg, ARRAY_SIZE(sysrq_tg_reg));
diff --git a/extensions/xt_TEE.c b/extensions/xt_TEE.c
index c9a4bda..ce25663 100644
--- a/extensions/xt_TEE.c
+++ b/extensions/xt_TEE.c
@@ -179,11 +179,8 @@ tee_tg4(struct sk_buff **pskb, const struct xt_target_param *par)
 	 * --gateway.
 	 */
 	skb = skb_copy(skb, GFP_ATOMIC);
-	if (skb == NULL) {
-		if (net_ratelimit())
-			pr_debug(KBUILD_MODNAME "copy failed!\n");
+	if (skb == NULL)
 		return XT_CONTINUE;
-	}
 
 #ifdef WITH_CONNTRACK
 	/*