From: Jeff Garzik Subject: [git patches] libata fix Date: Thu, 8 Apr 2010 12:58:49 -0400 Message-ID: <20100408165848.GA14360@havoc.gtf.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from havoc.gtf.org ([69.61.125.42]:57452 "EHLO havoc.gtf.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758158Ab0DHQ6t (ORCPT ); Thu, 8 Apr 2010 12:58:49 -0400 Content-Disposition: inline Sender: linux-ide-owner@vger.kernel.org List-Id: linux-ide@vger.kernel.org To: Andrew Morton , Linus Torvalds Cc: linux-ide@vger.kernel.org, LKML Please pull from 'upstream-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-linus to receive the following updates: include/linux/ata.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Mark Lord (1): libata: Fix accesses at LBA28 boundary (old bug, but nasty) (v2) diff --git a/include/linux/ata.h b/include/linux/ata.h index b4c85e2..700c5b9 100644 --- a/include/linux/ata.h +++ b/include/linux/ata.h @@ -1025,8 +1025,8 @@ static inline int ata_ok(u8 status) static inline int lba_28_ok(u64 block, u32 n_block) { - /* check the ending block number */ - return ((block + n_block) < ((u64)1 << 28)) && (n_block <= 256); + /* check the ending block number: must be LESS THAN 0x0fffffff */ + return ((block + n_block) < ((1 << 28) - 1)) && (n_block <= 256); } static inline int lba_48_ok(u64 block, u32 n_block)