From patchwork Wed Jul 7 19:07:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve French X-Patchwork-Id: 1501980 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-cifs-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=G7wd1rJv; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4GKpq018smz9sVb for ; Thu, 8 Jul 2021 05:08:12 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231248AbhGGTKu (ORCPT ); Wed, 7 Jul 2021 15:10:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47362 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230160AbhGGTKu (ORCPT ); Wed, 7 Jul 2021 15:10:50 -0400 Received: from mail-lf1-x135.google.com (mail-lf1-x135.google.com [IPv6:2a00:1450:4864:20::135]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A976C061574 for ; Wed, 7 Jul 2021 12:08:08 -0700 (PDT) Received: by mail-lf1-x135.google.com with SMTP id q18so6791383lfc.7 for ; Wed, 07 Jul 2021 12:08:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=N8o4s4S+U5bp6nCXpE01ZZjPN4ueWJ5Fv3glrcsfmXI=; b=G7wd1rJvXIQzZK4rkzpOFXRcsporoTWVCECpzGOF72qI+Uj81L+18f62EqKwRnFwZc WBMj1+NevPW5asSWfE6u5Rjhw0kqC2L6RfUZ042vYA00qEKB/QDdRriOgLwAY2dp9x8s W58gY4o/Wm0zJDVEltUZQob/vj3Wgt2JFZ1ZzOYDdWN5koti22iRJK43+gR6QOWX4l2W fjq1m1Sr5eslS+xbPEWlOxZc2cC0/XlXgzhWtCmpAD9B6Jy3MGZnyaaU9juN4yuJJTy0 usaQPLf2VmnAj0aHvpqiEH0axx+aShTFsrUCSfWEskwvh6kJ7SbR/X+0HcIms9WxAnDs t+2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=N8o4s4S+U5bp6nCXpE01ZZjPN4ueWJ5Fv3glrcsfmXI=; b=ahKG6LjwatC4RMxacziwWY2ydSdY/tl8AYrb4MorwUXvTmT3E6VKjKpfOPkgr5CXah ozfy4XRCmubIQKvHO3FHeGbuiU3S+75MVxPPhxz1w+8vM8yCT5+724N/Rqwnla1xp0fa 0NhCXUUB0egZktQBgJxrX9wuaE2fsnpLOtesetM31IM+B7Ja7SHluOe28rwgZ1lAXSXY Rw7JzfK89dp8SlSTAbMwt+qkTnTNgJjAfU7zi9MrRyqanVkLzf+JRU2/VC9nI9B7tSjL fYp6YnsA3/MuFqmqJ9OJ+7y6QoAeBMQuHd7cuHKFRjsT1o9i8QBJexV291Ztn6wTYUOx 52FA== X-Gm-Message-State: AOAM530D+AagGOR+g/OzTz6tRJo/+QzjUlBQmaTf8N+TiyplNfTuHVwH B/DCMCZUwfZvNNYY2s+LBGQ5XrHyyZPZR5VTIFTfej6SN0Y= X-Google-Smtp-Source: ABdhPJwbtGur3iZsbEz0GWm3URo77ph0dLZIO/69eymcWukkjJYF2c2yc2Nhb1taalWjGyHVNjm4BxcZAtAqHsXpIu0= X-Received: by 2002:a19:5043:: with SMTP id z3mr19121679lfj.282.1625684884967; Wed, 07 Jul 2021 12:08:04 -0700 (PDT) MIME-Version: 1.0 From: Steve French Date: Wed, 7 Jul 2021 14:07:52 -0500 Message-ID: Subject: [PATCH][CIFS] Clarify SMB1 code for POSIX Lock To: CIFS Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org Another trivial (Coverity reported issue) patch ... Coverity also complains about the way we calculate the offset (starting from the address of a 4 byte array within the header structure rather than from the beginning of the struct plus 4 bytes) for SMB1 PosixLock. This changeset doesn't change the address but makes it slightly clearer. Addresses-Coverity: 711520 ("Out of bounds write") Signed-off-by: Steve French Reviewed-by: Paulo Alcantara (SUSE) --- fs/cifs/cifssmb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) parm_data->lock_type = cpu_to_le16(lock_type); if (waitFlag) { From 7b7a11a7b5a865390621d156bd169a0a22dbeaf9 Mon Sep 17 00:00:00 2001 From: Steve French Date: Wed, 7 Jul 2021 14:03:54 -0500 Subject: [PATCH] CIFS: Clarify SMB1 code for POSIX Lock Coverity also complains about the way we calculate the offset (starting from the address of a 4 byte array within the header structure rather than from the beginning of the struct plus 4 bytes) for SMB1 PosixLock. This changeset doesn't change the address but makes it slightly clearer. Addresses-Coverity: 711520 ("Out of bounds write") Signed-off-by: Steve French --- fs/cifs/cifssmb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index 16bd4cf3bceb..f72e3b3dca69 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c @@ -2537,8 +2537,9 @@ CIFSSMBPosixLock(const unsigned int xid, struct cifs_tcon *tcon, pSMB->TotalDataCount = pSMB->DataCount; pSMB->TotalParameterCount = pSMB->ParameterCount; pSMB->ParameterOffset = cpu_to_le16(param_offset); + /* SMB offsets are from the beginning of SMB which is 4 bytes in, after RFC1001 field */ parm_data = (struct cifs_posix_lock *) - (((char *) &pSMB->hdr.Protocol) + offset); + (((char *)pSMB) + offset + 4); parm_data->lock_type = cpu_to_le16(lock_type); if (waitFlag) { -- 2.30.2