lkml.org 
[lkml]   [2017]   [Nov]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 094/147] cifs: silence compiler warnings showing up with gcc-4.7.0
    3.2.95-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Jeff Layton <jlayton@redhat.com>

    commit b2a3ad9ca502169fc4c11296fa20f56059c7c031 upstream.

    gcc-4.7.0 has started throwing these warnings when building cifs.ko.

    CC [M] fs/cifs/cifssmb.o
    fs/cifs/cifssmb.c: In function ‘CIFSSMBSetCIFSACL’:
    fs/cifs/cifssmb.c:3905:9: warning: array subscript is above array bounds [-Warray-bounds]
    fs/cifs/cifssmb.c: In function ‘CIFSSMBSetFileInfo’:
    fs/cifs/cifssmb.c:5711:8: warning: array subscript is above array bounds [-Warray-bounds]
    fs/cifs/cifssmb.c: In function ‘CIFSSMBUnixSetFileInfo’:
    fs/cifs/cifssmb.c:6001:25: warning: array subscript is above array bounds [-Warray-bounds]

    This patch cleans up the code a bit by using the offsetof macro instead
    of the funky "&pSMB->hdr.Protocol" construct.

    Signed-off-by: Jeff Layton <jlayton@redhat.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    fs/cifs/cifssmb.c | 24 ++++++++++++------------
    1 file changed, 12 insertions(+), 12 deletions(-)

    --- a/fs/cifs/cifssmb.c
    +++ b/fs/cifs/cifssmb.c
    @@ -3909,13 +3909,12 @@ CIFSSMBSetCIFSACL(const int xid, struct
    int rc = 0;
    int bytes_returned = 0;
    SET_SEC_DESC_REQ *pSMB = NULL;
    - NTRANSACT_RSP *pSMBr = NULL;
    + void *pSMBr;

    setCifsAclRetry:
    - rc = smb_init(SMB_COM_NT_TRANSACT, 19, tcon, (void **) &pSMB,
    - (void **) &pSMBr);
    + rc = smb_init(SMB_COM_NT_TRANSACT, 19, tcon, (void **) &pSMB, &pSMBr);
    if (rc)
    - return (rc);
    + return rc;

    pSMB->MaxSetupCount = 0;
    pSMB->Reserved = 0;
    @@ -3943,9 +3942,8 @@ setCifsAclRetry:
    pSMB->AclFlags = cpu_to_le32(aclflag);

    if (pntsd && acllen) {
    - memcpy((char *) &pSMBr->hdr.Protocol + data_offset,
    - (char *) pntsd,
    - acllen);
    + memcpy((char *)pSMBr + offsetof(struct smb_hdr, Protocol) +
    + data_offset, pntsd, acllen);
    inc_rfc1001_len(pSMB, byte_count + data_count);
    } else
    inc_rfc1001_len(pSMB, byte_count);
    @@ -5724,7 +5722,8 @@ CIFSSMBSetFileInfo(const int xid, struct
    param_offset = offsetof(struct smb_com_transaction2_sfi_req, Fid) - 4;
    offset = param_offset + params;

    - data_offset = (char *) (&pSMB->hdr.Protocol) + offset;
    + data_offset = (char *)pSMB +
    + offsetof(struct smb_hdr, Protocol) + offset;

    count = sizeof(FILE_BASIC_INFO);
    pSMB->MaxParameterCount = cpu_to_le16(2);
    @@ -5993,7 +5992,7 @@ CIFSSMBUnixSetFileInfo(const int xid, st
    u16 fid, u32 pid_of_opener)
    {
    struct smb_com_transaction2_sfi_req *pSMB = NULL;
    - FILE_UNIX_BASIC_INFO *data_offset;
    + char *data_offset;
    int rc = 0;
    u16 params, param_offset, offset, byte_count, count;

    @@ -6015,8 +6014,9 @@ CIFSSMBUnixSetFileInfo(const int xid, st
    param_offset = offsetof(struct smb_com_transaction2_sfi_req, Fid) - 4;
    offset = param_offset + params;

    - data_offset = (FILE_UNIX_BASIC_INFO *)
    - ((char *)(&pSMB->hdr.Protocol) + offset);
    + data_offset = (char *)pSMB +
    + offsetof(struct smb_hdr, Protocol) + offset;
    +
    count = sizeof(FILE_UNIX_BASIC_INFO);

    pSMB->MaxParameterCount = cpu_to_le16(2);
    @@ -6038,7 +6038,7 @@ CIFSSMBUnixSetFileInfo(const int xid, st
    inc_rfc1001_len(pSMB, byte_count);
    pSMB->ByteCount = cpu_to_le16(byte_count);

    - cifs_fill_unix_set_info(data_offset, args);
    + cifs_fill_unix_set_info((FILE_UNIX_BASIC_INFO *)data_offset, args);

    rc = SendReceiveNoRsp(xid, tcon->ses, (struct smb_hdr *) pSMB, 0);
    if (rc)
    \
     
     \ /
      Last update: 2017-11-08 20:58    [W:2.216 / U:0.368 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site