net: ppp: don't call sk_chk_filter twice
Subsystems (3)
PATCH 1/1 net: ppp: don't call sk_chk_filter twice
From: Christoph Schulz <[email protected]>
Commit 568f194e8bd16c353ad50f9ab95d98b20578a39d ("net: ppp: use sk_unattached_filter api") causes sk_chk_filter() to be called twice when setting a PPP pass or active filter. This applies to both the generic PPP subsystem implemented by drivers/net/ppp/ppp_generic.c and the ISDN PPP subsystem implemented by drivers/isdn/i4l/isdn_ppp.c. The first call is from within get_filter(). The second one is through the call chain
ppp_ioctl() or isdn_ppp_ioctl()
--> sk_unattached_filter_create()
--> __sk_prepare_filter()
--> sk_chk_filter()The first call from within get_filter() should be deleted as get_filter() is called just before calling sk_unattached_filter_create() later on, which eventually calls sk_chk_filter() anyway.
For 3.15.x, this proposed change is a bugfix rather than a pure optimization as in that branch, sk_chk_filter() may replace filter codes by other codes which are not recognized when executing sk_chk_filter() a second time. So with 3.15.x, if sk_chk_filter() is called twice, the second invocation may yield EINVAL (this depends on the filter codes found in the filter to be set, but because the replacement is done for frequently used codes, this is almost always the case). The net effect is that setting pass and/or active PPP filters does not work anymore, since sk_unattached_filter_create() always returns EINVAL due to the second call to sk_chk_filter(), regardless whether the filter was originally sane or not.
---
Sorry for the resend, I forgot to add [email protected] to the recipient list...
drivers/isdn/i4l/isdn_ppp.c +1 -6
@@ -442,7 +442,7 @@ static int get_filter(void __user *arg, struct sock_filter **p) {struct sock_fprog uprog;struct sock_filter *code =NULL ; -int len, err; +int len;if (copy_from_user (&uprog, arg,sizeof (uprog)))return -EFAULT ;
@@ -458,12 +458,6 @@ static int get_filter(void __user *arg, struct sock_filter **p)if (IS_ERR (code))return PTR_ERR (code); - err =sk_chk_filter (code, uprog.len); -if (err) { -kfree (code); -return err; - } - *p = code;return uprog.len; }
drivers/net/ppp/ppp_generic.c +1 -6
@@ -539,7 +539,7 @@ static int get_filter(void __user *arg, struct sock_filter **p) {struct sock_fprog uprog;struct sock_filter *code =NULL ; -int len, err; +int len;if (copy_from_user (&uprog, arg,sizeof (uprog)))return -EFAULT ;
@@ -554,12 +554,6 @@ static int get_filter(void __user *arg, struct sock_filter **p)if (IS_ERR (code))return PTR_ERR (code); - err =sk_chk_filter (code, uprog.len); -if (err) { -kfree (code); -return err; - } - *p = code;return uprog.len; }
Quoted 29 lines · Christoph Schulz
From: Christoph Schulz <[email protected]>
Commit
568f194e8bd16c353ad50f9ab95d98b20578a39d("net: ppp: usesk_unattached_filterapi") causessk_chk_filter()to be called twice when setting a PPP pass or active filter. This applies to both the generic PPP subsystem implemented bydrivers/net/ppp/ppp_generic.cand the ISDN PPP subsystem implemented bydrivers/isdn/i4l/isdn_ppp.c. The first call is from withinget_filter(). The second one is through the call chain
ppp_ioctl()orisdn_ppp_ioctl()
-->sk_unattached_filter_create()--> __sk_prepare_filter() --> sk_chk_filter()The first call from within
get_filter()should be deleted asget_filter()is called just before callingsk_unattached_filter_create()later on, which eventually callssk_chk_filter()anyway.For 3.15.x, this proposed change is a bugfix rather than a pure optimization as in that branch,
sk_chk_filter()may replace filter codes by other codes which are not recognized when executingsk_chk_filter()a second time. So with 3.15.x, ifsk_chk_filter()is called twice, the second invocation may yield EINVAL (this depends on the filter codes found in the filter to be set, but because the replacement is done for frequently used codes, this is almost always the case). The net effect is that setting pass and/or active PPP filters does not work anymore, sincesk_unattached_filter_create()always returns EINVAL due to the second call tosk_chk_filter(), regardless whether the filter was originally sane or not.
Quoted 1 line
Signed-off-by Christoph Schulz <[email protected]>
Thank you for fixing it.
Quoted 29 lines · Christoph Schulz
From: Christoph Schulz <[email protected]>
Commit
568f194e8bd16c353ad50f9ab95d98b20578a39d("net: ppp: usesk_unattached_filterapi") causessk_chk_filter()to be called twice when setting a PPP pass or active filter. This applies to both the generic PPP subsystem implemented bydrivers/net/ppp/ppp_generic.cand the ISDN PPP subsystem implemented bydrivers/isdn/i4l/isdn_ppp.c. The first call is from withinget_filter(). The second one is through the call chainppp_ioctl() or isdn_ppp_ioctl() --> sk_unattached_filter_create() --> __sk_prepare_filter() --> sk_chk_filter()The first call from within
get_filter()should be deleted asget_filter()is called just before callingsk_unattached_filter_create()later on, which eventually callssk_chk_filter()anyway.For 3.15.x, this proposed change is a bugfix rather than a pure optimization as in that branch,
sk_chk_filter()may replace filter codes by other codes which are not recognized when executingsk_chk_filter()a second time. So with 3.15.x, ifsk_chk_filter()is called twice, the second invocation may yield EINVAL (this depends on the filter codes found in the filter to be set, but because the replacement is done for frequently used codes, this is almost always the case). The net effect is that setting pass and/or active PPP filters does not work anymore, sincesk_unattached_filter_create()always returns EINVAL due to the second call tosk_chk_filter(), regardless whether the filter was originally sane or not.
Quoted 1 line
Signed-off-by Christoph Schulz <[email protected]>
Looking at [1]'s mbox, it seems to me your patch is corrupted by your email client (the last chunk not recognized) ... perhaps try to send it by using git-send-email(1).
Other than that, it's fine.