From patchwork Thu Dec 11 21:36:00 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Eder X-Patchwork-Id: 13636 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 833EEDDF5A for ; Fri, 12 Dec 2008 10:08:55 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757864AbYLKXIv (ORCPT ); Thu, 11 Dec 2008 18:08:51 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757742AbYLKXIu (ORCPT ); Thu, 11 Dec 2008 18:08:50 -0500 Received: from mail-bw0-f13.google.com ([209.85.218.13]:63240 "EHLO mail-bw0-f13.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757298AbYLKXIu (ORCPT ); Thu, 11 Dec 2008 18:08:50 -0500 Received: by bwz6 with SMTP id 6so2830887bwz.13 for ; Thu, 11 Dec 2008 15:08:48 -0800 (PST) Received: by 10.103.231.15 with SMTP id i15mr1625894mur.35.1229036096482; Thu, 11 Dec 2008 14:54:56 -0800 (PST) Received: from vmbox.hanneseder.net (chello080109038207.17.14.tuwien.teleweb.at [80.109.38.207]) by mx.google.com with ESMTPS id 7sm1557750mup.10.2008.12.11.14.54.53 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 11 Dec 2008 14:54:55 -0800 (PST) Message-ID: <49419a3f.0710660a.4800.7087@mx.google.com> Received: by vmbox.hanneseder.net (sSMTP sendmail emulation); Thu, 11 Dec 2008 01:00:35 +0100 To: netdev@vger.kernel.org Cc: Karsten Keil Cc: linux-kernel@vger.kernel.org Cc: kernel-janitors@vger.kernel.org Date: Thu, 11 Dec 2008 22:36:00 +0100 Subject: [PATCH 8/9][v2] mISDN: timerdev: use __user for mISDN_read's buffer argument From: Hannes Eder Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix this warning: drivers/isdn/mISDN/timerdev.c:264:11: warning: incorrect type in initializer (incompatible argument 2 (different address spaces)) drivers/isdn/mISDN/timerdev.c:264:11: expected int ( *read )( ... ) drivers/isdn/mISDN/timerdev.c:264:11: got int ( static [toplevel] * )( ... ) Signed-off-by: Hannes Eder Acked-by: Karsten Keil --- drivers/isdn/mISDN/timerdev.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/isdn/mISDN/timerdev.c b/drivers/isdn/mISDN/timerdev.c index 62b5e49..f2b3218 100644 --- a/drivers/isdn/mISDN/timerdev.c +++ b/drivers/isdn/mISDN/timerdev.c @@ -86,7 +86,7 @@ mISDN_close(struct inode *ino, struct file *filep) } static ssize_t -mISDN_read(struct file *filep, char *buf, size_t count, loff_t *off) +mISDN_read(struct file *filep, char __user *buf, size_t count, loff_t *off) { struct mISDNtimerdev *dev = filep->private_data; struct mISDNtimer *timer; @@ -116,7 +116,7 @@ mISDN_read(struct file *filep, char *buf, size_t count, loff_t *off) timer = (struct mISDNtimer *)dev->expired.next; list_del(&timer->list); spin_unlock_irqrestore(&dev->lock, flags); - if (put_user(timer->id, (int *)buf)) + if (put_user(timer->id, (int __user *)buf)) ret = -EFAULT; else ret = sizeof(int);