AX25 Patches for 2.4.17 and above - have they been included yet

AX25 Patches for 2.4.17 and above - have they been included yet

[Stephen Kitchener]

Hi,

I have been looking and searching the latest kernel pachecs and update for 
the fixes that were issued some time ago, but I have yet to see them.

The patches were issed by Henk De Groot and were as follows...

diff -ruN linux/net/core/sock.c linux/net/core/sock.c
--- linux/net/core/sock.c       Fri Dec 28 21:25:37 2001
+++ linux/net/core/sock.c       Fri Dec 28 21:26:35 2001
@@ -81,6 +81,7 @@
  *             Andi Kleen      :       Fix write_space callback
  *             Chris Evans     :       Security fixes - signedness again
  *             Arnaldo C. Melo :       cleanups, use skb_queue_purge
+ *             Jeroen Vreeken  :       Add check for sk->dead in 
sock_def_write_space
  *
  * To Fix:
  *
@@ -1146,7 +1147,7 @@
        /* Do not wake up a writer until he can make "significant"
         * progress.  --DaveM
         */
-       if((atomic_read(&sk->wmem_alloc) << 1) <= sk->sndbuf) {
+       if(!sk->dead && (atomic_read(&sk->wmem_alloc) << 1) <= sk->sndbuf) {
                if (sk->sleep && waitqueue_active(sk->sleep))
                        wake_up_interruptible(sk->sleep);

These were, I believe, issed against the 2.4.17 kernel.

These were to fix a lock up problem that I have encountered when useing an 
scc card and the scc utilites but might have been more general to ax25 use.

Have I missed something and they are there in the kernel now, haven't seen 
anything listed in the kernel changes or are these fixes being incorporated 
in the 2.5.xx series.


-- 
Stephen Kitchener

Re: AX25 Patches for 2.4.17 and above - have they been included yet

[Alan Cox]

> I have been looking and searching the latest kernel pachecs and update for 
> the fixes that were issued some time ago, but I have yet to see them.

Thats because they were wrong..

> + *             Jeroen Vreeken  :       Add check for sk->dead in 
> sock_def_write_space
>   *
>   * To Fix:
>   *
> @@ -1146,7 +1147,7 @@
>         /* Do not wake up a writer until he can make "significant"
>          * progress.  --DaveM
>          */
> -       if((atomic_read(&sk->wmem_alloc) << 1) <= sk->sndbuf) {
> +       if(!sk->dead && (atomic_read(&sk->wmem_alloc) << 1) <= sk->sndbuf) {
>                 if (sk->sleep && waitqueue_active(sk->sleep))

See 2.4.18-ac which has a newer update for this.

Re: AX25 Patches for 2.4.17 and above - have they been included yet

[David S. Miller]

   From: Stephen Kitchener <stephen@g6dzj.demon.co.uk>
   Date: Wed, 13 Feb 2002 10:03:11 +0000

   I have been looking and searching the latest kernel pachecs and update for 
   the fixes that were issued some time ago, but I have yet to see them.
   
   The patches were issed by Henk De Groot and were as follows...

The patch hasn't been included because it is bogus.
Please check the list archives.  He needs to fix it in
another way.