From 33db992c39a73bc4f252030b029d6c104798f027 Mon Sep 17 00:00:00 2001 From: John Haxby Date: Fri, 24 Jun 2011 14:14:13 +0100 Subject: [PATCH] xt_SYSRQ: make IPv6 trigger work again IPv6 sysrq never worked because of bad pointer arithmetic. --- doc/changelog.txt | 1 + extensions/xt_SYSRQ.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/changelog.txt b/doc/changelog.txt index 491f479..d74b2d8 100644 --- a/doc/changelog.txt +++ b/doc/changelog.txt @@ -2,6 +2,7 @@ HEAD ==== Fixes: +- xt_SYSRQ: make IPv6 trigger work again - xt_TARPIT: fix a kernel oops in --reset mode diff --git a/extensions/xt_SYSRQ.c b/extensions/xt_SYSRQ.c index d8c0100..787204b 100644 --- a/extensions/xt_SYSRQ.c +++ b/extensions/xt_SYSRQ.c @@ -253,7 +253,7 @@ sysrq_tg6(struct sk_buff **pskb, const struct xt_action_param *par) ": " NIP6_FMT ":%hu -> :%hu len=%u\n", NIP6(iph->saddr), ntohs(udph->source), ntohs(udph->dest), len); - return sysrq_tg(udph + sizeof(struct udphdr), len); + return sysrq_tg((void *)udph + sizeof(struct udphdr), len); } #endif @@ -376,6 +376,7 @@ module_init(sysrq_tg_init); module_exit(sysrq_tg_exit); MODULE_DESCRIPTION("Xtables: triggering SYSRQ remotely"); MODULE_AUTHOR("Jan Engelhardt "); +MODULE_AUTHOR("John Haxby