p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

irda: don't open-code memdup_user() 

and no, GFP_ATOMIC does not make any sense there...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2017-05-13 18:20:33 -04:00
parent 7f2d17c67a
commit aa47cc1c3c
1 changed files with 12 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
net/irda/af_irda.c
View File

@ -1901,16 +1901,10 @@ static int irda_setsockopt(struct socket *sock, int level, int optname,
goto out;
}
ias_opt = kmalloc(sizeof(struct irda_ias_set), GFP_ATOMIC);
if (ias_opt == NULL) {
err = -ENOMEM;
goto out;
}
/* Copy query to the driver. */
if (copy_from_user(ias_opt, optval, optlen)) {
kfree(ias_opt);
err = -EFAULT;
ias_opt = memdup_user(optval, optlen);
if (IS_ERR(ias_opt)) {
err = PTR_ERR(ias_opt);
goto out;
}
@ -2032,16 +2026,10 @@ static int irda_setsockopt(struct socket *sock, int level, int optname,
goto out;
}
ias_opt = kmalloc(sizeof(struct irda_ias_set), GFP_ATOMIC);
if (ias_opt == NULL) {
err = -ENOMEM;
goto out;
}
/* Copy query to the driver. */
if (copy_from_user(ias_opt, optval, optlen)) {
kfree(ias_opt);
err = -EFAULT;
ias_opt = memdup_user(optval, optlen);
if (IS_ERR(ias_opt)) {
err = PTR_ERR(ias_opt);
goto out;
}
@ -2317,16 +2305,10 @@ static int irda_getsockopt(struct socket *sock, int level, int optname,
goto out;
}
ias_opt = kmalloc(sizeof(struct irda_ias_set), GFP_ATOMIC);
if (ias_opt == NULL) {
err = -ENOMEM;
goto out;
}
/* Copy query to the driver. */
if (copy_from_user(ias_opt, optval, len)) {
kfree(ias_opt);
err = -EFAULT;
ias_opt = memdup_user(optval, len);
if (IS_ERR(ias_opt)) {
err = PTR_ERR(ias_opt);
goto out;
}
@ -2381,16 +2363,10 @@ static int irda_getsockopt(struct socket *sock, int level, int optname,
goto out;
}
ias_opt = kmalloc(sizeof(struct irda_ias_set), GFP_ATOMIC);
if (ias_opt == NULL) {
err = -ENOMEM;
goto out;
}
/* Copy query to the driver. */
if (copy_from_user(ias_opt, optval, len)) {
kfree(ias_opt);
err = -EFAULT;
ias_opt = memdup_user(optval, len);
if (IS_ERR(ias_opt)) {
err = PTR_ERR(ias_opt);
goto out;
}