mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] tty/n_gsm: fix bug in CRC calculation for gsm1 mode
@ 2011-03-27  0:05 Mikhail Kshevetskiy
  2011-03-27 13:30 ` Alan Cox
  2011-03-31 12:11 ` Alan Cox
  0 siblings, 2 replies; 4+ messages in thread
From: Mikhail Kshevetskiy @ 2011-03-27  0:05 UTC (permalink / raw)
  To: linux-serial; +Cc: Greg Kroah-Hartman, stable, linux-kernel

Problem description:
  gsm_queue() calculate a CRC for arrived frames. As a last step of
  CRC calculation it call

    gsm->fcs = gsm_fcs_add(gsm->fcs, gsm->received_fcs);

  This work perfectly for the case of GSM0 mode as gsm->received_fcs
  contain the last piece of data required to generate final CRC.

  gsm->received_fcs is not used for GSM1 mode. Thus we put an
  additional byte to CRC calculation. As result we get a wrong CRC
  and reject incoming frame.

Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@gmail.com>
---
 drivers/tty/n_gsm.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
index 176f632..4806276 100644
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
@@ -1658,8 +1658,12 @@ static void gsm_queue(struct gsm_mux *gsm)
 
 	if ((gsm->control & ~PF) == UI)
 		gsm->fcs = gsm_fcs_add_block(gsm->fcs, gsm->buf, gsm->len);
-	/* generate final CRC with received FCS */
-	gsm->fcs = gsm_fcs_add(gsm->fcs, gsm->received_fcs);
+	if (gsm->encoding == 0){
+		/* WARNING: gsm->received_fcs is used for gsm->encoding = 0 only.
+		            In this case it contain the last piece of data
+		            required to generate final CRC */
+		gsm->fcs = gsm_fcs_add(gsm->fcs, gsm->received_fcs);
+	}
 	if (gsm->fcs != GOOD_FCS) {
 		gsm->bad_fcs++;
 		if (debug & 4)
-- 
1.7.4.1


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] tty/n_gsm: fix bug in CRC calculation for gsm1 mode
  2011-03-27  0:05 [PATCH] tty/n_gsm: fix bug in CRC calculation for gsm1 mode Mikhail Kshevetskiy
@ 2011-03-27 13:30 ` Alan Cox
  2011-03-27 17:33   ` Mikhail Kshevetskiy
  2011-03-31 12:11 ` Alan Cox
  1 sibling, 1 reply; 4+ messages in thread
From: Alan Cox @ 2011-03-27 13:30 UTC (permalink / raw)
  To: Mikhail Kshevetskiy
  Cc: linux-serial, Greg Kroah-Hartman, stable, linux-kernel

>   gsm->received_fcs is not used for GSM1 mode. Thus we put an
>   additional byte to CRC calculation. As result we get a wrong CRC
>   and reject incoming frame.

That much is true except that it was originally tested with gsm encoding
1 on various modems for a while and not seen the problem. So I am trying
to work out why or whether some of the GSM0 patches broke GSM1 somewhere.

What hardware was it tested on ?

It looks right - probably the code wants pushing into
gsm0_receive/gsm1_receive appropriately so no special cases leak into
gsm_queue.



> 
> Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@gmail.com>
> ---
>  drivers/tty/n_gsm.c |    8 ++++++--
>  1 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
> index 176f632..4806276 100644
> --- a/drivers/tty/n_gsm.c
> +++ b/drivers/tty/n_gsm.c
> @@ -1658,8 +1658,12 @@ static void gsm_queue(struct gsm_mux *gsm)
>  
>  	if ((gsm->control & ~PF) == UI)
>  		gsm->fcs = gsm_fcs_add_block(gsm->fcs, gsm->buf, gsm->len);
> -	/* generate final CRC with received FCS */
> -	gsm->fcs = gsm_fcs_add(gsm->fcs, gsm->received_fcs);
> +	if (gsm->encoding == 0){
> +		/* WARNING: gsm->received_fcs is used for gsm->encoding = 0 only.
> +		            In this case it contain the last piece of data
> +		            required to generate final CRC */
> +		gsm->fcs = gsm_fcs_add(gsm->fcs, gsm->received_fcs);
> +	}
>  	if (gsm->fcs != GOOD_FCS) {
>  		gsm->bad_fcs++;
>  		if (debug & 4)


-- 
--
	"Alan, I'm getting a bit worried about you."
				-- Linus Torvalds

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] tty/n_gsm: fix bug in CRC calculation for gsm1 mode
  2011-03-27 13:30 ` Alan Cox
@ 2011-03-27 17:33   ` Mikhail Kshevetskiy
  0 siblings, 0 replies; 4+ messages in thread
From: Mikhail Kshevetskiy @ 2011-03-27 17:33 UTC (permalink / raw)
  To: Alan Cox; +Cc: linux-serial, Greg Kroah-Hartman, stable, linux-kernel

On Sun, 27 Mar 2011 14:30:24 +0100
Alan Cox <alan@lxorguk.ukuu.org.uk> wrote:

> >   gsm->received_fcs is not used for GSM1 mode. Thus we put an
> >   additional byte to CRC calculation. As result we get a wrong CRC
> >   and reject incoming frame.
> 
> That much is true except that it was originally tested with gsm encoding
> 1 on various modems for a while and not seen the problem. So I am trying
> to work out why or whether some of the GSM0 patches broke GSM1 somewhere.

as i can see, it's your commit c2f2f0000bb69f067fea12624272e6a58a811702.

Why we need received_fcs variable? We can completely drop it and calculate
fsc in gsm0_receive() and gsm1_receive(). gsm_queue() in this case will
contain only fsc checking code.

> What hardware was it tested on ?

Enfora, Inc. Enabler-III G Modem

> It looks right - probably the code wants pushing into
> gsm0_receive/gsm1_receive appropriately so no special cases leak into
> gsm_queue.

It's possible, see my comment about received_fcs variable above

> 
> 
> > 
> > Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@gmail.com>
> > ---
> >  drivers/tty/n_gsm.c |    8 ++++++--
> >  1 files changed, 6 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
> > index 176f632..4806276 100644
> > --- a/drivers/tty/n_gsm.c
> > +++ b/drivers/tty/n_gsm.c
> > @@ -1658,8 +1658,12 @@ static void gsm_queue(struct gsm_mux *gsm)
> >  
> >  	if ((gsm->control & ~PF) == UI)
> >  		gsm->fcs = gsm_fcs_add_block(gsm->fcs, gsm->buf, gsm->len);
> > -	/* generate final CRC with received FCS */
> > -	gsm->fcs = gsm_fcs_add(gsm->fcs, gsm->received_fcs);
> > +	if (gsm->encoding == 0){
> > +		/* WARNING: gsm->received_fcs is used for gsm->encoding = 0 only.
> > +		            In this case it contain the last piece of data
> > +		            required to generate final CRC */
> > +		gsm->fcs = gsm_fcs_add(gsm->fcs, gsm->received_fcs);
> > +	}
> >  	if (gsm->fcs != GOOD_FCS) {
> >  		gsm->bad_fcs++;
> >  		if (debug & 4)
> 
> 
> -- 
> --
> 	"Alan, I'm getting a bit worried about you."
> 				-- Linus Torvalds

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] tty/n_gsm: fix bug in CRC calculation for gsm1 mode
  2011-03-27  0:05 [PATCH] tty/n_gsm: fix bug in CRC calculation for gsm1 mode Mikhail Kshevetskiy
  2011-03-27 13:30 ` Alan Cox
@ 2011-03-31 12:11 ` Alan Cox
  1 sibling, 0 replies; 4+ messages in thread
From: Alan Cox @ 2011-03-31 12:11 UTC (permalink / raw)
  To: Mikhail Kshevetskiy
  Cc: linux-serial, Greg Kroah-Hartman, stable, linux-kernel

On Sun, 27 Mar 2011 04:05:00 +0400
Mikhail Kshevetskiy <mikhail.kshevetskiy@gmail.com> wrote:

> Problem description:
>   gsm_queue() calculate a CRC for arrived frames. As a last step of
>   CRC calculation it call
> 
>     gsm->fcs = gsm_fcs_add(gsm->fcs, gsm->received_fcs);
> 
>   This work perfectly for the case of GSM0 mode as gsm->received_fcs
>   contain the last piece of data required to generate final CRC.
> 
>   gsm->received_fcs is not used for GSM1 mode. Thus we put an
>   additional byte to CRC calculation. As result we get a wrong CRC
>   and reject incoming frame.
> 
> Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@gmail.com>

Acked-by: Alan Cox <alan@linux.intel.com>

(This wants cleaning up better as Mikhael also says but this patch is
clear and unlike a big clean up a better base point for a stable fix and
can be reworked further)

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2011-03-31 12:11 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-03-27  0:05 [PATCH] tty/n_gsm: fix bug in CRC calculation for gsm1 mode Mikhail Kshevetskiy
2011-03-27 13:30 ` Alan Cox
2011-03-27 17:33   ` Mikhail Kshevetskiy
2011-03-31 12:11 ` Alan Cox

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®