Pointer dereference in net/irda/ircomm/ircomm_tty.c
PATCH 1/1 Pointer dereference in net/irda/ircomm/ircomm_tty.c
hi,
this fixes coverity bugs #855 and #854. In both cases tty is dereferenced before getting checked for NULL. Compile tested only.
net/irda/ircomm/ircomm_tty.c renamed from net/irda/ircomm/ircomm_tty.c.orig +9 -5
@@ -493,7 +493,7 @@ static int ircomm_tty_open(struct tty_st*/ static void ircomm_tty_close (struct tty_struct *tty,struct file *filp) { -struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data; +struct ircomm_tty_cb *self;unsigned long flags;IRDA_DEBUG (0 ,"%s()\n" , __FUNCTION__ );
@@ -501,6 +501,8 @@ static void ircomm_tty_close(struct tty_if (!tty)return ; + self = (struct ircomm_tty_cb *) tty->driver_data; + IRDA_ASSERT(self != NULL, return;); IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
@@ -1006,17 +1008,19 @@ static void ircomm_tty_shutdown(struct i*/ static void ircomm_tty_hangup (struct tty_struct *tty) { -struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data; +struct ircomm_tty_cb *self;unsigned long flags;IRDA_DEBUG (0 ,"%s()\n" , __FUNCTION__ ); - IRDA_ASSERT(self != NULL, return;); - IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;); -if (!tty)return ; + self = (struct ircomm_tty_cb *) tty->driver_data; + + IRDA_ASSERT(self != NULL, return;); + IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;); +/* ircomm_tty_flush_buffer(tty); */ ircomm_tty_shutdown (self);
Quoted 2 lines · Eric Sesterhenn
this fixes coverity bugs #855 and #854. In both cases tty is dereferenced before getting checked for NULL.
Before Al will flame you,
IMO, what should be done is removing asserts checking for "self", because ->driver_data is filled in ircomm_tty_open() with valid pointer.
Quoted 43 lines
net/irda/ircomm/ircomm_tty.c renamed from net/irda/ircomm/ircomm_tty.c.orig +9
-5@@ -493,7 +493,7 @@ static int ircomm_tty_open(struct tty_st*/ static void ircomm_tty_close (struct tty_struct *tty,struct file *filp) { -struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data; +struct ircomm_tty_cb *self;unsigned long flags;IRDA_DEBUG (0 ,"%s()\n" , __FUNCTION__ );@@ -501,6 +501,8 @@ static void ircomm_tty_close(struct tty_if (!tty)return ; + self = (struct ircomm_tty_cb *) tty->driver_data; + IRDA_ASSERT(self != NULL, return;); IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);@@ -1006,17 +1008,19 @@ static void ircomm_tty_shutdown(struct i*/ static void ircomm_tty_hangup (struct tty_struct *tty) { -struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data; +struct ircomm_tty_cb *self;unsigned long flags;IRDA_DEBUG (0 ,"%s()\n" , __FUNCTION__ ); - IRDA_ASSERT(self != NULL, return;); - IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;); -if (!tty)return ; + self = (struct ircomm_tty_cb *) tty->driver_data; + + IRDA_ASSERT(self != NULL, return;); + IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;); +/* ircomm_tty_flush_buffer(tty); */ ircomm_tty_shutdown (self);
hi,
Quoted 5 lines · Alexey Dobriyan
Quoted 2 lines · Eric Sesterhenn
this fixes coverity bugs #855 and #854. In both cases tty is dereferenced before getting checked for NULL.
Before Al will flame you,
I know you prefer doing it yourself :)
Quoted 2 lines
IMO, what should be done is removing asserts checking for "self", because ->driver_data is filled in
ircomm_tty_open()with valid pointer.
Updated patch below.
net/irda/ircomm/ircomm_tty.c renamed from net/irda/ircomm/ircomm_tty.c.orig +0 -2
@@ -501,7 +501,6 @@ static void ircomm_tty_close(struct tty_if (!tty)return ; - IRDA_ASSERT(self != NULL, return;); IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);spin_lock_irqsave (&self->spinlock, flags);
@@ -1011,7 +1010,6 @@ static void ircomm_tty_hangup(struct ttyIRDA_DEBUG (0 ,"%s()\n" , __FUNCTION__ ); - IRDA_ASSERT(self != NULL, return;); IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);if (!tty)
Quoted 8 lines · Alexey Dobriyan
Quoted 2 lines · Eric Sesterhenn
this fixes coverity bugs #855 and #854. In both cases tty is dereferenced before getting checked for NULL.
Before Al will flame you,
IMO, what should be done is removing asserts checking for "self", because ->driver_data is filled in
ircomm_tty_open()with valid pointer.
That's not what the Coverity checker is warning about.
It warns that "tty" is first dereferenced and later checked for NULL.
Quoted 36 lines
Quoted 36 lines
net/irda/ircomm/ircomm_tty.c renamed from net/irda/ircomm/ircomm_tty.c.orig +4
-5@@ -493,7 +493,7 @@ static int ircomm_tty_open(struct tty_st*/ static void ircomm_tty_close (struct tty_struct *tty,struct file *filp) { -struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data; +struct ircomm_tty_cb *self;unsigned long flags;IRDA_DEBUG (0 ,"%s()\n" , __FUNCTION__ );@@ -501,6 +501,8 @@ static void ircomm_tty_close(struct tty_if (!tty)return ; + self = (struct ircomm_tty_cb *) tty->driver_data; + IRDA_ASSERT(self != NULL, return;); IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);@@ -1006,17 +1008,19 @@ static void ircomm_tty_shutdown(struct i*/ static void ircomm_tty_hangup (struct tty_struct *tty) { -struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data; +struct ircomm_tty_cb *self;unsigned long flags;IRDA_DEBUG (0 ,"%s()\n" , __FUNCTION__ ); - IRDA_ASSERT(self != NULL, return;); - IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;); -if (!tty)return ;
Quoted 7 lines
net/irda/ircomm/ircomm_tty.c static void ircomm_tty_shutdown(struct i · line 1025
Quoted 7 lines
net/irda/ircomm/ircomm_tty.c renamed from net/irda/ircomm/ircomm_tty.c.orig +5
-0+ self = (struct ircomm_tty_cb *) tty->driver_data; + + IRDA_ASSERT(self != NULL, return;); + IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;); +/* ircomm_tty_flush_buffer(tty); */ ircomm_tty_shutdown (self);
cu
Adrian
Signature · 4 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed