[NET_SCHED 2.6.21]: cls_tcindex: fix compatibility breakage

[NET_SCHED 2.6.21]: cls_tcindex: fix compatibility breakage

[Patrick McHardy]

[-- Attachment #1: Type: text/plain, Size: 104 bytes --]

Fix tcindex userspace compatibility breakage on big-endian.
Patch applies to current -git and -stable.


[-- Attachment #2: x --]
[-- Type: text/plain, Size: 1281 bytes --]

[NET_SCHED]: cls_tcindex: fix compatibility breakage

Userspace uses an integer for TCA_TCINDEX_SHIFT, the kernel was changed
to expect and use a u16 value in 2.6.11, which broke compatibility on
big endian machines. Change back to use int.

Reported by Ole Reinartz <ole.reinartz@gmx.de>

Signed-off-by: Patrick McHardy <kaber@trash.net>

---
commit 763d781919d5a69bea12c8f191486c562f16f515
tree 6dc589cde5689766059f32d451b65ff1f40509e0
parent 526a622afe930173cae35fe53948f380f0c04fef
author Patrick McHardy <kaber@trash.net> Mon, 09 Apr 2007 05:55:58 +0200
committer Patrick McHardy <kaber@trash.net> Mon, 09 Apr 2007 05:55:58 +0200

 net/sched/cls_tcindex.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/sched/cls_tcindex.c b/net/sched/cls_tcindex.c
index 040e2d2..7563fdc 100644
--- a/net/sched/cls_tcindex.c
+++ b/net/sched/cls_tcindex.c
@@ -245,9 +245,9 @@ tcindex_set_parms(struct tcf_proto *tp, unsigned long base, u32 handle,
 	}
 
 	if (tb[TCA_TCINDEX_SHIFT-1]) {
-		if (RTA_PAYLOAD(tb[TCA_TCINDEX_SHIFT-1]) < sizeof(u16))
+		if (RTA_PAYLOAD(tb[TCA_TCINDEX_SHIFT-1]) < sizeof(int))
 			goto errout;
-		cp.shift = *(u16 *) RTA_DATA(tb[TCA_TCINDEX_SHIFT-1]);
+		cp.shift = *(int *) RTA_DATA(tb[TCA_TCINDEX_SHIFT-1]);
 	}
 
 	err = -EBUSY;

Re: [NET_SCHED 2.6.21]: cls_tcindex: fix compatibility breakage

[David Miller]

From: Patrick McHardy <kaber@trash.net>
Date: Mon, 09 Apr 2007 18:30:42 +0200

> Fix tcindex userspace compatibility breakage on big-endian.
> Patch applies to current -git and -stable.

Applied, thanks Patrick.

I'll push to -stable later today.