xt_SYSRQ: make IPv6 trigger work again

IPv6 sysrq never worked because of bad pointer arithmetic.
This commit is contained in:
John Haxby
2011-06-24 14:14:13 +01:00
committed by Jan Engelhardt
parent 85d8f98dd7
commit 33db992c39
2 changed files with 3 additions and 1 deletions

View File

@@ -2,6 +2,7 @@
HEAD
====
Fixes:
- xt_SYSRQ: make IPv6 trigger work again
- xt_TARPIT: fix a kernel oops in --reset mode

View File

@@ -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 <jengelh@medozas.de>");
MODULE_AUTHOR("John Haxby <john.haxby@oracle.com");
MODULE_LICENSE("GPL");
MODULE_ALIAS("ipt_SYSRQ");
MODULE_ALIAS("ip6t_SYSRQ");