Skip to content

Commit b8d6b0d

Browse files
Julia Lawalltorvalds
Julia Lawall
authored andcommitted
drivers/telephony/ixj.c: use memdup_user
Use memdup_user when user data is immediately copied into the allocated region. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ expression from,to,size,flag; position p; identifier l1,l2; @@ - to = \(kmalloc@p\|kzalloc@p\)(size,flag); + to = memdup_user(from,size); if ( - to==NULL + IS_ERR(to) || ...) { <+... when != goto l1; - -ENOMEM + PTR_ERR(to) ...+> } - if (copy_from_user(to, from, size) != 0) { - <+... when != goto l2; - -EFAULT - ...+> - } // </smpl> Signed-off-by: Julia Lawall <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 8fc809d commit b8d6b0d

File tree

1 file changed

+4
-11
lines changed

1 file changed

+4
-11
lines changed

drivers/telephony/ixj.c

+4-11
Original file line numberDiff line numberDiff line change
@@ -5879,20 +5879,13 @@ static int ixj_build_cadence(IXJ *j, IXJ_CADENCE __user * cp)
58795879
static int ixj_build_filter_cadence(IXJ *j, IXJ_FILTER_CADENCE __user * cp)
58805880
{
58815881
IXJ_FILTER_CADENCE *lcp;
5882-
lcp = kmalloc(sizeof(IXJ_FILTER_CADENCE), GFP_KERNEL);
5883-
if (lcp == NULL) {
5882+
lcp = memdup_user(cp, sizeof(IXJ_FILTER_CADENCE));
5883+
if (IS_ERR(lcp)) {
58845884
if(ixjdebug & 0x0001) {
5885-
printk(KERN_INFO "Could not allocate memory for cadence\n");
5885+
printk(KERN_INFO "Could not allocate memory for cadence or could not copy cadence to kernel\n");
58865886
}
5887-
return -ENOMEM;
5887+
return PTR_ERR(lcp);
58885888
}
5889-
if (copy_from_user(lcp, cp, sizeof(IXJ_FILTER_CADENCE))) {
5890-
if(ixjdebug & 0x0001) {
5891-
printk(KERN_INFO "Could not copy cadence to kernel\n");
5892-
}
5893-
kfree(lcp);
5894-
return -EFAULT;
5895-
}
58965889
if (lcp->filter > 5) {
58975890
if(ixjdebug & 0x0001) {
58985891
printk(KERN_INFO "Cadence out of range\n");

0 commit comments

Comments
 (0)