rose: Fix Null pointer dereference in rose_send_frame()
Subsystems (2)
PATCH v2 1/1 rose: Fix Null pointer dereference in rose_send_frame()
rose_send_frame() dereferences neigh->dev when called from rose_transmit_clear_request(), and the first occurance of the neigh is in rose_loopback_timer() as rose_loopback_neigh, and it is initialized in rose_add_loopback_neigh() as NULL. i.e when rose_loopback_neigh used in rose_loopback_timer() its ->dev was still NULL and rose_loopback_timer() was calling rose_rx_call_request() without checking for NULL.
- net/rose/rose_link.c
This bug seems to get triggered in this line:
rose_call = (ax25_address *)neigh->dev->dev_addr;
Fix it by adding NULL checking for rose_loopback_neigh->dev in rose_loopback_timer().
--- net/rose/rose_loopback.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/rose/rose_loopback.c +1 -1
@@ -96,7 +96,7 @@ static void rose_loopback_timer(struct timer_list *unused) }if (frametype ==ROSE_CALL_REQUEST ) { -if ((dev =rose_dev_get (dest)) !=NULL ) { +if (rose_loopback_neigh->dev && (dev =rose_dev_get (dest)) !=NULL ) {if (rose_rx_call_request (skb, dev, rose_loopback_neigh, lci_o) ==0 )kfree_skb (skb); }else {
Signature · 1 line
2.29.2
Quoted 18 lines · Anmol Karn
rose_send_frame()dereferencesneigh->devwhen called fromrose_transmit_clear_request(), and the first occurance of theneighis inrose_loopback_timer()asrose_loopback_neigh, and it is initialized
inrose_add_loopback_neigh()as NULL. i.e whenrose_loopback_neighused inrose_loopback_timer()its->devwas still NULL androse_loopback_timer()
was callingrose_rx_call_request()without checking for NULL.-
net/rose/rose_link.c
This bug seems to get triggered in this line:
rose_call= (ax25_address*)neigh->dev->dev_addr;Fix it by adding NULL checking for
rose_loopback_neigh->devinrose_loopback_timer().
Quoted 6 lines
Reported-and-tested-by:
[email protected] Link:
https://syzkaller.appspot.com/bug?id=9d2a7ca8c7f2e4b682c97578dfa3f236258300b3Signed-off-by Anmol Karn <[email protected]>
missing proper fixes tag.
Quoted 18 lines
--- net/rose/rose_loopback.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)net/rose/rose_loopback.c +1
-1@@ -96,7 +96,7 @@ static void rose_loopback_timer(struct timer_list *unused) }if (frametype ==ROSE_CALL_REQUEST ) { -if ((dev =rose_dev_get (dest)) !=NULL ) { +if (rose_loopback_neigh->dev && (dev =rose_dev_get (dest)) !=NULL ) { if (rose_rx_call_request(skb, dev,
rose_loopback_neigh,lci_o) == 0)
net/rose/rose_loopback.c static void rose_loopback_timer(struct timer_list *unused) · line 102
Quoted 2 lines
net/rose/rose_loopback.c +0
-0kfree_skb (skb); }else {
check patch is not happy:
WARNING:TYPO_SPELLING: 'occurance' may be misspelled - perhaps 'occurrence'?
#7:rose_transmit_clear_request(), and the first occurance of the neigh
ERROR:ASSIGN_IN_IF: do not use assignment in if condition #36: FILE: net/rose/rose_loopback.c:99:
+ if (rose_loopback_neigh->dev && (dev =rose_dev_get(dest)) != NULL) {
total: 1 errors, 1 warnings, 0 checks, 8 lines checked
Hello Sir,
Quoted 56 lines · Saeed Mahameed
Quoted 18 lines · Anmol Karn
rose_send_frame()dereferencesneigh->devwhen called fromrose_transmit_clear_request(), and the first occurance of theneighis inrose_loopback_timer()asrose_loopback_neigh, and it is initialized
inrose_add_loopback_neigh()as NULL. i.e whenrose_loopback_neighused inrose_loopback_timer()its->devwas still NULL androse_loopback_timer()
was callingrose_rx_call_request()without checking for NULL.-
net/rose/rose_link.c
This bug seems to get triggered in this line:
rose_call= (ax25_address*)neigh->dev->dev_addr;Fix it by adding NULL checking for
rose_loopback_neigh->devinrose_loopback_timer().Quoted 6 lines
Reported-and-tested-by:
[email protected] Link:
https://syzkaller.appspot.com/bug?id=9d2a7ca8c7f2e4b682c97578dfa3f236258300b3Signed-off-by Anmol Karn <[email protected]>missing proper fixes tag.
Quoted 18 lines
--- net/rose/rose_loopback.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)net/rose/rose_loopback.c +1
-1@@ -96,7 +96,7 @@ static void rose_loopback_timer(struct timer_list *unused) }if (frametype ==ROSE_CALL_REQUEST ) { -if ((dev =rose_dev_get (dest)) !=NULL ) { +if (rose_loopback_neigh->dev && (dev =rose_dev_get (dest)) !=NULL ) { if (rose_rx_call_request(skb, dev,
rose_loopback_neigh,lci_o) == 0)net/rose/rose_loopback.c static void rose_loopback_timer(struct timer_list *unused) · line 102
Quoted 2 lines
net/rose/rose_loopback.c +0
-0kfree_skb (skb); }else {check patch is not happy:
WARNING:TYPO_SPELLING: 'occurance' may be misspelled - perhaps 'occurrence'?
#7:rose_transmit_clear_request(), and the first occurance of theneigh
Quoted 8 lines
ERROR:ASSIGN_IN_IF: do not use assignment in if condition #36: FILE:
net/rose/rose_loopback.c:99:
+ if (rose_loopback_neigh->dev&& (dev =rose_dev_get(dest)) != NULL) {total: 1 errors, 1 warnings, 0 checks, 8 lines checked
Thank you for your review will rectify these and send another version.
Thanks,
Anmol
PATCH v3 1/1 rose: Fix Null pointer dereference in rose_send_frame()
rose_send_frame() dereferences neigh->dev when called from rose_transmit_clear_request(), and the first occurrence of the neigh is in rose_loopback_timer() as rose_loopback_neigh, and it is initialized in rose_add_loopback_neigh() as NULL. i.e when rose_loopback_neigh used in rose_loopback_timer() its ->dev was still NULL and rose_loopback_timer() was calling rose_rx_call_request() without checking for NULL.
- net/rose/rose_link.c
This bug seems to get triggered in this line:
rose_call = (ax25_address *)neigh->dev->dev_addr;
Fix it by adding NULL checking for rose_loopback_neigh->dev in rose_loopback_timer().
---
Changes in v3:
- Corrected checkpatch warnings and errors (Suggested-by: Saeed Mahameed <[email protected]>)
- Added "Fixes:" tag (Suggested-by: Saeed Mahameed <[email protected]>)
Changes in v2:
- Added NULL check in rose_loopback_timer() (Suggested-by: Greg KH <[email protected]>)
net/rose/rose_loopback.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/rose/rose_loopback.c +2 -1
@@ -96,7 +96,8 @@ static void rose_loopback_timer(struct timer_list *unused) }if (frametype ==ROSE_CALL_REQUEST ) { -if ((dev =rose_dev_get (dest)) !=NULL ) { + dev =rose_dev_get (dest); +if (rose_loopback_neigh->dev && dev) {if (rose_rx_call_request (skb, dev, rose_loopback_neigh, lci_o) ==0 )kfree_skb (skb); }else {
-
2.29.2
Jakub Kicinski
maintainernet/rose/rose_loopback.c static void rose_loopback_timer(struct timer_list *unused) · line 99
Quoted 1 line · On Sun, 8 Nov 2020 00:48:35 +0530 Anmol Karn wrote:
net/rose/rose_loopback.c +1
-0+ dev =rose_dev_get (dest);
this calls dev_hold internally, you never release that reference in case ..neigh->dev is NULL
Quoted 1 line
net/rose/rose_loopback.c +1
-0+if (rose_loopback_neigh->dev && dev) {
Hello Sir,
Quoted 7 lines · Jakub Kicinski
net/rose/rose_loopback.c static void rose_loopback_timer(struct timer_list *unused) · line 99
Quoted 1 line · On Sun, 8 Nov 2020 00:48:35 +0530 Anmol Karn wrote:
net/rose/rose_loopback.c +1
-0+ dev =rose_dev_get (dest);this calls
dev_holdinternally, you never release that reference in case ..neigh->dev is NULLnet/rose/rose_loopback.c static void rose_loopback_timer(struct timer_list *unused) · line 100
Quoted 1 line
net/rose/rose_loopback.c +1
-0+if (rose_loopback_neigh->dev && dev) {
Ah, I missed to dev_put() the dev after checking for, if neigh->dev is NULL, I will fix it soon and send another version.
Thank you for review.
Anmol
PATCH v4 1/1 rose: Fix Null pointer dereference in rose_send_frame()
rose_send_frame() dereferences neigh->dev when called from rose_transmit_clear_request(), and the first occurrence of the neigh is in rose_loopback_timer() as rose_loopback_neigh, and it is initialized in rose_add_loopback_neigh() as NULL. i.e when rose_loopback_neigh used in rose_loopback_timer() its ->dev was still NULL and rose_loopback_timer() was calling rose_rx_call_request() without checking for NULL.
- net/rose/rose_link.c
This bug seems to get triggered in this line:
rose_call = (ax25_address *)neigh->dev->dev_addr;
Fix it by adding NULL checking for rose_loopback_neigh->dev in rose_loopback_timer().
---
Changes in v4:
- Free dev(on dev_hold()), when neigh->dev is NULL. (Suggested-by: Jakub Kicinski <[email protected]>)
Changes in v3:
- Corrected checkpatch warnings and errors (Suggested-by: Saeed Mahameed <[email protected]>)
- Added "Fixes:" tag (Suggested-by: Saeed Mahameed <[email protected]>)
Changes in v2:
- Added NULL check in rose_loopback_timer() (Suggested-by: Greg KH <[email protected]>)
net/rose/rose_loopback.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/rose/rose_loopback.c +3 -1
@@ -96,10 +96,12 @@ static void rose_loopback_timer(struct timer_list *unused) }if (frametype ==ROSE_CALL_REQUEST ) { -if ((dev =rose_dev_get (dest)) !=NULL ) { + dev =rose_dev_get (dest); +if (rose_loopback_neigh->dev && dev) {if (rose_rx_call_request (skb, dev, rose_loopback_neigh, lci_o) ==0 )kfree_skb (skb); }else { +dev_put (dev);kfree_skb (skb); } }else {
--
2.29.2
Jakub Kicinski
maintainerQuoted 30 lines · On Wed, 11 Nov 2020 22:29:54 +0530 Anmol Karn wrote:
rose_send_frame()dereferencesneigh->devwhen called fromrose_transmit_clear_request(), and the first occurrence of theneighis inrose_loopback_timer()asrose_loopback_neigh, and it is initialized inrose_add_loopback_neigh()as NULL. i.e whenrose_loopback_neighused inrose_loopback_timer()its->devwas still NULL androse_loopback_timer()was callingrose_rx_call_request()without checking for NULL.-
net/rose/rose_link.c
This bug seems to get triggered in this line:
rose_call= (ax25_address*)neigh->dev->dev_addr;Fix it by adding NULL checking for
rose_loopback_neigh->devinrose_loopback_timer().Fixes 1da177e4c3f4 ("Linux-2.6.12-rc2")Reported-by [email protected]Tested-by [email protected]Signed-off-by Anmol Karn <[email protected]>net/rose/rose_loopback.c +0
-0@@ -96,10 +96,12 @@ static void rose_loopback_timer(struct timer_list *unused) }if (frametype ==ROSE_CALL_REQUEST ) {
net/rose/rose_loopback.c static void rose_loopback_timer(struct timer_list *unused) · line 107
Quoted 10 lines
net/rose/rose_loopback.c +3
-1-if ((dev =rose_dev_get (dest)) !=NULL ) { + dev =rose_dev_get (dest); +if (rose_loopback_neigh->dev && dev) {if (rose_rx_call_request (skb, dev, rose_loopback_neigh, lci_o) ==0 )kfree_skb (skb); }else { +dev_put (dev);kfree_skb (skb); } }else {
This is still not correct. With this code dev_put() could be called with NULL, which would cause a crash.
There is also a dev_put() missing if rose_rx_call_request() returns 0.
I think that this is the correct code:
net/rose/rose_loopback.c +14 -4
@@ -96,11 +96,22 @@ static void rose_loopback_timer(struct timer_list *unused) }if (frametype ==ROSE_CALL_REQUEST ) { -if ((dev =rose_dev_get (dest)) !=NULL ) { -if (rose_rx_call_request (skb, dev, rose_loopback_neigh, lci_o) ==0 ) -kfree_skb (skb); - }else { +if (!rose_loopback_neigh->dev) {kfree_skb (skb); +continue ; + } + + dev =rose_dev_get (dest); +if (!dev) { +kfree_skb (skb); +continue ; + } + +if (rose_rx_call_request (skb, dev, rose_loopback_neigh, + lci_o) ==0 ) { +dev_put (dev); +kfree_skb (skb); } }else {kfree_skb (skb);
Please test this and resubmit it if it works.
Quoted 80 lines · Jakub Kicinski
Quoted 30 lines · On Wed, 11 Nov 2020 22:29:54 +0530 Anmol Karn wrote:
rose_send_frame()dereferencesneigh->devwhen called fromrose_transmit_clear_request(), and the first occurrence of theneighis inrose_loopback_timer()asrose_loopback_neigh, and it is initialized inrose_add_loopback_neigh()as NULL. i.e whenrose_loopback_neighused inrose_loopback_timer()its->devwas still NULL androse_loopback_timer()was callingrose_rx_call_request()without checking for NULL.-
net/rose/rose_link.c
This bug seems to get triggered in this line:
rose_call= (ax25_address*)neigh->dev->dev_addr;Fix it by adding NULL checking for
rose_loopback_neigh->devinrose_loopback_timer().Fixes 1da177e4c3f4 ("Linux-2.6.12-rc2")Reported-by [email protected]Tested-by [email protected]Signed-off-by Anmol Karn <[email protected]>net/rose/rose_loopback.c +0
-0@@ -96,10 +96,12 @@ static void rose_loopback_timer(struct timer_list *unused) }if (frametype ==ROSE_CALL_REQUEST ) {net/rose/rose_loopback.c static void rose_loopback_timer(struct timer_list *unused) · line 107
Quoted 10 lines
net/rose/rose_loopback.c +3
-1-if ((dev =rose_dev_get (dest)) !=NULL ) { + dev =rose_dev_get (dest); +if (rose_loopback_neigh->dev && dev) {if (rose_rx_call_request (skb, dev, rose_loopback_neigh, lci_o) ==0 )kfree_skb (skb); }else { +dev_put (dev);kfree_skb (skb); } }else {This is still not correct. With this code
dev_put()could be called with NULL, which would cause a crash.There is also a
dev_put()missing ifrose_rx_call_request()returns 0.I think that this is the correct code:
net/rose/rose_loopback.c +14
-4@@ -96,11 +96,22 @@ static void rose_loopback_timer(struct timer_list *unused) }if (frametype ==ROSE_CALL_REQUEST ) { -if ((dev =rose_dev_get (dest)) !=NULL ) { -if (rose_rx_call_request (skb, dev, rose_loopback_neigh, lci_o) ==0 ) -kfree_skb (skb); - }else { +if (!rose_loopback_neigh->dev) {kfree_skb (skb); +continue ; + } + + dev =rose_dev_get (dest); +if (!dev) { +kfree_skb (skb); +continue ; + } + +if (rose_rx_call_request (skb, dev, rose_loopback_neigh, + lci_o) ==0 ) { +dev_put (dev); +kfree_skb (skb); } }else {kfree_skb (skb);
Quoted 1 line
Please test this and resubmit it if it works.
Sure sir, I will test it and resend, if it works.
Thanks,
Anmol
PATCH v5 1/1 rose: Fix Null pointer dereference in rose_send_frame()
rose_send_frame() dereferences neigh->dev when called from rose_transmit_clear_request(), and the first occurrence of the neigh is in rose_loopback_timer() as rose_loopback_neigh, and it is initialized in rose_add_loopback_neigh() as NULL. i.e when rose_loopback_neigh used in rose_loopback_timer() its ->dev was still NULL and rose_loopback_timer() was calling rose_rx_call_request() without checking for NULL.
- net/rose/rose_link.c
This bug seems to get triggered in this line:
rose_call = (ax25_address *)neigh->dev->dev_addr;
Fix it by adding NULL checking for rose_loopback_neigh->dev in rose_loopback_timer().
---
Changes in v5:
- Free dev in rose_rx_call_request() and add NULL check for dev before freeing it. (Suggested-by: Jakub Kicinski <[email protected]>)
Changes in v4:
- Free dev(on dev_hold()), when neigh->dev is NULL. (Suggested-by: Jakub Kicinski <[email protected]>)
Changes in v3:
- Corrected checkpatch warnings and errors (Suggested-by: Saeed Mahameed <[email protected]>)
- Added "Fixes:" tag (Suggested-by: Saeed Mahameed <[email protected]>)
Changes in v2:
- Added NULL check in rose_loopback_timer() (Suggested-by: Greg KH <[email protected]>)
net/rose/rose_loopback.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
net/rose/rose_loopback.c +13 -4
@@ -96,10 +96,19 @@ static void rose_loopback_timer(struct timer_list *unused) }if (frametype ==ROSE_CALL_REQUEST ) { -if ((dev =rose_dev_get (dest)) !=NULL ) { -if (rose_rx_call_request (skb, dev, rose_loopback_neigh, lci_o) ==0 ) -kfree_skb (skb); - }else { +if (!rose_loopback_neigh->dev) { +kfree_skb (skb); +continue ; + } + + dev =rose_dev_get (dest); +if (!dev) { +kfree_skb (skb); +continue ; + } + +if (rose_rx_call_request (skb, dev, rose_loopback_neigh, lci_o) ==0 ) { +dev_put (dev);kfree_skb (skb); } }else {
--
2.29.2
Quoted 16 lines · On Fri, 20 Nov 2020 00:40:43 +0530 Anmol Karn wrote:
rose_send_frame()dereferencesneigh->devwhen called fromrose_transmit_clear_request(), and the first occurrence of theneighis inrose_loopback_timer()asrose_loopback_neigh, and it is initialized inrose_add_loopback_neigh()as NULL. i.e whenrose_loopback_neighused inrose_loopback_timer()its->devwas still NULL androse_loopback_timer()was callingrose_rx_call_request()without checking for NULL.-
net/rose/rose_link.c
This bug seems to get triggered in this line:
rose_call= (ax25_address*)neigh->dev->dev_addr;Fix it by adding NULL checking for
rose_loopback_neigh->devinrose_loopback_timer().
Quoted 6 lines
Fixes 1da177e4c3f4 ("Linux-2.6.12-rc2")Suggested-by Jakub Kicinski <[email protected]>Reported-by [email protected]Tested-by [email protected]Signed-off-by Anmol Karn <[email protected]>
Applied to net, thanks!
PATCH v2 1/1 net: rose: Fix Null pointer dereference in rose_send_frame()
In reply to Anmol Karnrose_send_frame() dereferences neigh->dev when called from rose_transmit_clear_request(), and the first occurrence of the neigh is in rose_loopback_timer() as rose_loopback_neigh, and it is initialized in rose_add_loopback_neigh() as NULL. i.e when rose_loopback_neigh used in rose_loopback_timer() its ->dev was still NULL and rose_loopback_timer() was calling rose_rx_call_request() without checking for NULL.
- net/rose/rose_link.c
This bug seems to get triggered in this line:
rose_call = (ax25_address *)neigh->dev->dev_addr;
Fix it by adding NULL checking for rose_loopback_neigh->dev in rose_loopback_timer().
---
Changes in v3:
- Corrected checkpatch warnings and errors (Suggested-by: Saeed Mahameed <[email protected]>)
- Added "Fixes:" tag (Suggested-by: Saeed Mahameed <[email protected]>)
Changes in v2:
- Added NULL check in rose_loopback_timer() (Suggested-by: Greg KH <[email protected]>)
net/rose/rose_loopback.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/rose/rose_loopback.c +2 -1
@@ -96,7 +96,8 @@ static void rose_loopback_timer(struct timer_list *unused) }if (frametype ==ROSE_CALL_REQUEST ) { -if ((dev =rose_dev_get (dest)) !=NULL ) { + dev =rose_dev_get (dest); +if (rose_loopback_neigh->dev && dev) {if (rose_rx_call_request (skb, dev, rose_loopback_neigh, lci_o) ==0 )kfree_skb (skb); }else {
-
2.29.2
Re: [Linux-kernel-mentees] [PATCH v2] net: rose: Fix Null pointer dereference in rose_send_frame()
Hello,
Sorry for this wrong subject(It should be v3 instead of v2), please ignore this patch.
I will send a new one with the corrected subject.
Thanks,
Anmol
Quoted 49 lines · Anmol Karn
rose_send_frame()dereferencesneigh->devwhen called fromrose_transmit_clear_request(), and the first occurrence of theneighis inrose_loopback_timer()asrose_loopback_neigh, and it is initialized inrose_add_loopback_neigh()as NULL. i.e whenrose_loopback_neighused inrose_loopback_timer()its->devwas still NULL androse_loopback_timer()was callingrose_rx_call_request()without checking for NULL.-
net/rose/rose_link.c
This bug seems to get triggered in this line:
rose_call= (ax25_address*)neigh->dev->dev_addr;Fix it by adding NULL checking for
rose_loopback_neigh->devinrose_loopback_timer().Fixes 1da177e4c3f4 ("Linux-2.6.12-rc2")Reported-by [email protected]Tested-by [email protected]Signed-off-by Anmol Karn <[email protected]>---
Changes in v3:
- Corrected checkpatch warnings and errors (Suggested-by: Saeed Mahameed <[email protected]>)
- Added "Fixes:" tag (Suggested-by: Saeed Mahameed <[email protected]>)
Changes in v2:
- Added NULL check inrose_loopback_timer()(Suggested-by: Greg KH <[email protected]>)net/rose/rose_loopback.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)net/rose/rose_loopback.c +2
-2@@ -96,7 +96,8 @@ static void rose_loopback_timer(struct timer_list *unused) }if (frametype ==ROSE_CALL_REQUEST ) { -if ((dev =rose_dev_get (dest)) !=NULL ) { + dev =rose_dev_get (dest); +if (rose_loopback_neigh->dev && dev) {if (rose_rx_call_request (skb, dev, rose_loopback_neigh, lci_o) ==0 )kfree_skb (skb); }else { -2.29.2