Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id ; Sat, 22 Feb 2003 17:53:51 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id ; Sat, 22 Feb 2003 17:53:51 -0500 Received: from [212.156.4.132] ([212.156.4.132]:56056 "EHLO fep02.ttnet.net.tr") by vger.kernel.org with ESMTP id ; Sat, 22 Feb 2003 17:53:50 -0500 Date: Sun, 23 Feb 2003 01:03:48 +0200 From: Faik Uygur To: andre@linux-ide.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH] 2.5.62: /proc/ide/hpt366 returns incomplete data [7/17] Message-ID: <20030222230348.GF2996@ttnet.net.tr> Mail-Followup-To: andre@linux-ide.org, linux-kernel@vger.kernel.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-9 Content-Disposition: inline User-Agent: Mutt/1.4i X-PGP-Fingerprint: 15 C0 AA 31 59 F9 DE 4F 7D A6 C7 D8 A0 D5 67 73 X-PGP-Key-ID: 0x5C447959 X-PGP-Key-Size: 2048 bits X-Editor: GNU Emacs 21.2.1 X-Operating-System: Debian GNU/Linux Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1151 Lines: 36 This patch fixes the incomplete data return problem of /proc/ide/hpt366. When the number of consecutive read bytes are smaller than the total data in hpt366_get_info(), the second read() returns 0. --- linux-2.5.62-vanilla/drivers/ide/pci/hpt366.c Sat Feb 22 23:00:40 2003 +++ linux-2.5.62/drivers/ide/pci/hpt366.c Sun Feb 23 00:01:09 2003 @@ -85,7 +85,7 @@ char *chipset_nums[] = {"366", "366", "368", "370", "370A", "372", "302", "371", "374" }; - int i; + int i, len; p += sprintf(p, "\n " "HighPoint HPT366/368/370/372/374\n"); @@ -153,8 +153,12 @@ } } p += sprintf(p, "\n"); + + /* p - buffer must be less than 4k! */ + len = (p - buffer) - offset; + *addr = buffer + offset; - return p-buffer;/* => must be less than 4k! */ + return len > count ? count : len; } #endif /* defined(DISPLAY_HPT366_TIMINGS) && defined(CONFIG_PROC_FS) */ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/