diff options
Diffstat (limited to 'drivers/net/ppp/ppp_generic.c')
| -rw-r--r-- | drivers/net/ppp/ppp_generic.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c index e2f20f807de8..d5b77ef3a210 100644 --- a/drivers/net/ppp/ppp_generic.c +++ b/drivers/net/ppp/ppp_generic.c | |||
| @@ -757,10 +757,15 @@ static long ppp_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
| 757 | }; | 757 | }; |
| 758 | 758 | ||
| 759 | ppp_lock(ppp); | 759 | ppp_lock(ppp); |
| 760 | if (ppp->pass_filter) | 760 | if (ppp->pass_filter) { |
| 761 | sk_unattached_filter_destroy(ppp->pass_filter); | 761 | sk_unattached_filter_destroy(ppp->pass_filter); |
| 762 | err = sk_unattached_filter_create(&ppp->pass_filter, | 762 | ppp->pass_filter = NULL; |
| 763 | &fprog); | 763 | } |
| 764 | if (fprog.filter != NULL) | ||
| 765 | err = sk_unattached_filter_create(&ppp->pass_filter, | ||
| 766 | &fprog); | ||
| 767 | else | ||
| 768 | err = 0; | ||
| 764 | kfree(code); | 769 | kfree(code); |
| 765 | ppp_unlock(ppp); | 770 | ppp_unlock(ppp); |
| 766 | } | 771 | } |
| @@ -778,10 +783,15 @@ static long ppp_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
| 778 | }; | 783 | }; |
| 779 | 784 | ||
| 780 | ppp_lock(ppp); | 785 | ppp_lock(ppp); |
| 781 | if (ppp->active_filter) | 786 | if (ppp->active_filter) { |
| 782 | sk_unattached_filter_destroy(ppp->active_filter); | 787 | sk_unattached_filter_destroy(ppp->active_filter); |
| 783 | err = sk_unattached_filter_create(&ppp->active_filter, | 788 | ppp->active_filter = NULL; |
| 784 | &fprog); | 789 | } |
| 790 | if (fprog.filter != NULL) | ||
| 791 | err = sk_unattached_filter_create(&ppp->active_filter, | ||
| 792 | &fprog); | ||
| 793 | else | ||
| 794 | err = 0; | ||
| 785 | kfree(code); | 795 | kfree(code); |
| 786 | ppp_unlock(ppp); | 796 | ppp_unlock(ppp); |
| 787 | } | 797 | } |